diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 2257133d40..1e944a7667 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -48,16 +48,17 @@ concurrency: jobs: - build_linux: + build_linux: # Separate so unit tests can wait on just Linux builds to complete. name: Build Linux strategy: fail-fast: false # Don't run scheduled builds on forks: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} - uses: ./.github/workflows/build_check_cache.yml + uses: ./.github/workflows/build_deps.yml with: os: ubuntu-24.04 build-deps-only: ${{ inputs.build-deps-only || false }} + force-build: ${{ github.event_name == 'schedule' }} secrets: inherit build_all: name: Build Non-Linux @@ -70,7 +71,7 @@ jobs: arch: arm64 # Don't run scheduled builds on forks: if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }} - uses: ./.github/workflows/build_check_cache.yml + uses: ./.github/workflows/build_deps.yml with: os: ${{ matrix.os }} arch: ${{ matrix.arch }} @@ -112,7 +113,7 @@ jobs: path: build/tests/**/*.log - name: Publish Test Results if: always() - uses: EnricoMi/publish-unit-test-result-action@v2 + uses: EnricoMi/publish-unit-test-result-action/linux@v2 with: files: "ctest_results.xml" flatpak: diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml deleted file mode 100644 index 00b5f71ecd..0000000000 --- a/.github/workflows/build_check_cache.yml +++ /dev/null @@ -1,62 +0,0 @@ -name: Check Cache - -on: - workflow_call: - inputs: - os: - required: true - type: string - arch: - required: false - type: string - build-deps-only: - required: false - type: boolean - force-build: - required: false - type: boolean - -jobs: - check_cache: # determines if there is a cache and outputs variables used in caching process - name: Check Cache - runs-on: ${{ inputs.os }} - outputs: - cache-key: ${{ steps.set_outputs.outputs.cache-key }} - cache-path: ${{ steps.set_outputs.outputs.cache-path }} - valid-cache: ${{ steps.cache_deps.outputs.cache-hit }} - steps: - - name: Checkout - uses: actions/checkout@v6 - with: - lfs: 'true' - - - name: set outputs - id: set_outputs - env: - dep-folder-name: ${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }} - output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} - run: | - echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} - echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }} - - - name: load cache - id: cache_deps - uses: actions/cache@v4 - with: - path: ${{ steps.set_outputs.outputs.cache-path }} - key: ${{ steps.set_outputs.outputs.cache-key }} - lookup-only: true - - build_deps: # call next step - name: Build Deps - needs: [check_cache] - uses: ./.github/workflows/build_deps.yml - with: - cache-key: ${{ needs.check_cache.outputs.cache-key }} - cache-path: ${{ needs.check_cache.outputs.cache-path }} - valid-cache: ${{ needs.check_cache.outputs.valid-cache == 'true' }} - os: ${{ inputs.os }} - arch: ${{ inputs.arch }} - build-deps-only: ${{ inputs.build-deps-only }} - force-build: ${{ inputs.force-build }} - secrets: inherit diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index b255b6abf7..045f9f7f2a 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -1,15 +1,6 @@ on: workflow_call: inputs: - cache-key: - required: true - type: string - cache-path: - required: true - type: string - valid-cache: - required: true - type: boolean os: required: true type: string @@ -26,55 +17,62 @@ on: jobs: build_deps: name: Build Deps - if: ${{ !cancelled() && (inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true) }} runs-on: ${{ inputs.os }} + outputs: + artifact-name: ${{ env.ARTIFACT_NAME }} + artifact-path: ${{ env.DEPS_PATH }} env: - date: + DO_BUILD: ${{ inputs.build-deps-only || inputs.force-build }} + DEPS_PATH: ${{ github.workspace }}/deps/build${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }} + ARTIFACT_NAME: OrcaSlicer_dep_${{ inputs.os }}_${{ inputs.arch }} steps: - - # Setup the environment - name: Checkout uses: actions/checkout@v6 with: lfs: 'true' + # Cached deps are just the final outputs, no intermediate files. + # So building XOR cache loading. + # We use `lookup-only` to skip pulling cache. - name: load cached deps - uses: actions/cache@v4 + uses: actions/cache/restore@v4 + id: cache-load with: - path: ${{ inputs.cache-path }} - key: ${{ inputs.cache-key }} + path: ${{ env.DEPS_PATH }} + key: ${{ inputs.os }}-${{ inputs.arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} + lookup-only: ${{ env.DO_BUILD == 'true' }} # Doing this instead of `if` preserves the outputs of this step - uses: lukka/get-cmake@latest + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') }} with: cmakeVersion: "~3.28.0" # use most recent 3.28.x version - name: setup dev on Windows - if: inputs.os == 'windows-latest' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }} uses: microsoft/setup-msbuild@v2 - name: Get the date on Ubuntu and macOS - if: inputs.os != 'windows-latest' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os != 'windows-latest' }} run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV shell: bash - name: Get the date on Windows - if: inputs.os == 'windows-latest' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }} run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8 shell: pwsh - - # Build Dependencies - name: Build on Windows - if: inputs.os == 'windows-latest' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }} working-directory: ${{ github.workspace }} run: | choco install strawberryperl .\build_release_vs.bat deps - .\build_release_vs.bat pack - cd ${{ github.workspace }}/deps/build + # Windows and Linux don't need to delete any directories, because they only package up deps/build/OrcaSlicer_dep. + # But Mac has multiple and we're preserving their directory structure relationship. + # So the garbage siblings of OrcaSlicer_dep can be deleted to save artifact and cache space. - name: Build on Mac ${{ inputs.arch }} - if: inputs.os == 'macos-14' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'macos-14' }} working-directory: ${{ github.workspace }} run: | brew install automake texinfo libtool @@ -87,53 +85,40 @@ jobs: done brew install zstd - - name: Apt-Install Dependencies - if: inputs.os == 'ubuntu-24.04' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'ubuntu-24.04' }} uses: ./.github/actions/apt-install-deps - name: Build on Ubuntu - if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' + if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }} working-directory: ${{ github.workspace }} run: | - mkdir -p ${{ github.workspace }}/deps/build/destdir ./build_linux.sh -dr - cd deps/build - tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir - - # Upload Artifacts - # - name: Upload Mac ${{ inputs.arch }} artifacts - # if: inputs.os == 'macos-14' - # uses: actions/upload-artifact@v5 - # with: - # name: OrcaSlicer_dep_mac_${{ env.date }} - # path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz - - - name: Upload Windows artifacts - if: inputs.os == 'windows-latest' + - name: Upload OrcaSlicer_dep director(ies) for use later + if: ${{ !cancelled() && ! env.ACT}} uses: actions/upload-artifact@v5 with: - name: OrcaSlicer_dep_win64_${{ env.date }} - path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip + name: ${{ env.ARTIFACT_NAME }} + path: ${{ env.DEPS_PATH }} + retention-days: 10 # It's not too big, but we don't need it for a very long time. + if-no-files-found: error - - name: Upload Ubuntu artifacts - if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }} - env: - ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }} - uses: actions/upload-artifact@v5 + - name: Save cache from main branch + if: ${{ !cancelled() && github.ref == 'refs/heads/main' && steps.cache-load.outputs.cache-hit != 'true' }} + uses: actions/cache/save@v4 with: - name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }} - path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz + path: ${{ env.DEPS_PATH }} + key: ${{ steps.cache-load.outputs.cache-primary-key }} build_orca: name: Build OrcaSlicer needs: [build_deps] - if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success())) }} + if: ${{ !cancelled() && (!inputs.build-deps-only || inputs.force-build) }} uses: ./.github/workflows/build_orca.yml with: - cache-key: ${{ inputs.cache-key }} - cache-path: ${{ inputs.cache-path }} + artifact-name: ${{ needs.build_deps.outputs.artifact-name }} + artifact-path: ${{ needs.build_deps.outputs.artifact-path }} os: ${{ inputs.os }} arch: ${{ inputs.arch }} secrets: inherit diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index aef491f006..986ac4059c 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -1,10 +1,10 @@ on: workflow_call: inputs: - cache-key: + artifact-name: required: true type: string - cache-path: + artifact-path: required: true type: string os: @@ -30,12 +30,11 @@ jobs: with: lfs: 'true' - - name: load cached deps - uses: actions/cache@v4 + - name: Download deps artifacts + uses: actions/download-artifact@v4 with: - path: ${{ inputs.cache-path }} - key: ${{ inputs.cache-key }} - fail-on-cache-miss: true + name: ${{ inputs.artifact-name }} + path: ${{ inputs.artifact-path }} - uses: lukka/get-cmake@latest with: diff --git a/CMakeLists.txt b/CMakeLists.txt index f2fe7fd414..162763621c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,7 +346,7 @@ if(WIN32) if (DEFINED ENV{WindowsSdkDir} AND DEFINED ENV{WindowsSDKVersion}) set(WIN10SDK_INCLUDE_PATH "$ENV{WindowsSdkDir}/Include/$ENV{WindowsSDKVersion}") else () - set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.22000.0") + set(WIN10SDK_INCLUDE_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.26100.0") endif () if (NOT EXISTS "${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h") message("${WIN10SDK_INCLUDE_PATH}/winrt/windows.graphics.printing3d.h was not found") diff --git a/README.md b/README.md index b70b7cc431..59fb76034b 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ If you come across any of these in search results, please report them as Use varied infill [patterns](https://github.com/OrcaSlicer/OrcaSlicer/wiki/strength_settings_patterns) and accurate hole shapes for improved clarity. - **[Overhang](https://github.com/OrcaSlicer/OrcaSlicer/wiki/quality_settings_overhangs) and [Support Optimization](https://github.com/OrcaSlicer/OrcaSlicer/wiki#support-settings)** Modify geometry for printable overhangs with precise support placement. -- **[Granular Controls](https://github.com/OrcaSlicer/OrcaSlicer/wiki#process-settings and Customization)** +- **[Granular Controls and Customization](https://github.com/OrcaSlicer/OrcaSlicer/wiki#process-settings)** Fine-tune print speed, layer height, pressure, and temperature with precision. - **Network Printer Support** Seamless integration with Klipper, PrusaLink, and OctoPrint for remote control. diff --git a/build_linux.sh b/build_linux.sh index 9a9a9160ba..3159557146 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -21,7 +21,7 @@ function usage() { echo " -p: boost ccache hit rate by disabling precompiled headers (default: ON)" echo " -r: skip RAM and disk checks (low RAM compiling)" echo " -s: build the Orca Slicer (optional)" - echo " -t: build tests (optional), requires -s flag" + echo " -t: build tests (optional)" echo " -u: install system dependencies (asks for sudo password; build prerequisite)" echo " -l: use Clang instead of GCC (default: GCC)" echo " -L: use ld.lld as linker (if available)" diff --git a/deps/CGAL/0001-clang19.patch b/deps/CGAL/0001-clang19.patch deleted file mode 100644 index 92a0293735..0000000000 --- a/deps/CGAL/0001-clang19.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/BGL/include/CGAL/boost/graph/iterator.h 2022-10-07 19:04:41 UTC -+++ b/BGL/include/CGAL/boost/graph/iterator.h -@@ -213,18 +213,7 @@ class Halfedge_around_source_iterator { (public) - {} - - #ifndef DOXYGEN_RUNNING -- // design patter: "safe bool" -- // will be replaced by explicit operator bool with C++11 -- typedef void (Halfedge_around_source_iterator::*bool_type)() const; - -- void this_type_does_not_support_comparisons() const {} -- -- operator bool_type() const -- { -- return (! (this->base() == nullptr)) ? -- &Halfedge_around_source_iterator::this_type_does_not_support_comparisons : 0; -- } -- - bool operator==( const Self& i) const { - CGAL_assertion( anchor == anchor); - return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); -@@ -313,18 +302,7 @@ class Halfedge_around_target_iterator { (public) - {} - - #ifndef DOXYGEN_RUNNING -- // design patter: "safe bool" -- // will be replaced by explicit operator bool with C++11 -- typedef void (Halfedge_around_target_iterator::*bool_type)() const; - -- void this_type_does_not_support_comparisons() const {} -- -- operator bool_type() const -- { -- return (! (this->base() == nullptr)) ? -- &Halfedge_around_target_iterator::this_type_does_not_support_comparisons : 0; -- } -- - bool operator==( const Self& i) const { - CGAL_assertion( anchor == anchor); - return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); -@@ -411,18 +389,6 @@ class Halfedge_around_face_iterator { (public) - const value_type& operator * ( ) const { return pos; } - pointer operator -> ( ) { return &pos; } - const value_type* operator -> ( ) const { return &pos; } -- -- // design patter: "safe bool" -- // will be replaced by explicit operator bool with C++11 -- typedef void (Halfedge_around_face_iterator::*bool_type)() const; -- -- void this_type_does_not_support_comparisons() const {} -- -- operator bool_type() const -- { -- return (! (this->base() == nullptr)) ? -- &Halfedge_around_face_iterator::this_type_does_not_support_comparisons : 0; -- } - - bool operator==( const Self& i) const { - CGAL_assertion( anchor == anchor); diff --git a/deps/CGAL/CGAL.cmake b/deps/CGAL/CGAL.cmake index 73eee6701b..ec77e0ebae 100644 --- a/deps/CGAL/CGAL.cmake +++ b/deps/CGAL/CGAL.cmake @@ -5,11 +5,10 @@ endif () orcaslicer_add_cmake_project( CGAL # GIT_REPOSITORY https://github.com/CGAL/cgal.git - # GIT_TAG bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0 + # GIT_TAG 3654f780ae0c64675cabaef0e5ddaf904c48b4b7 # releases/CGAL-5.6.3 # For whatever reason, this keeps downloading forever (repeats downloads if finished) - URL https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip - URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0 - PATCH_COMMAND git apply ${CGAL_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch + URL https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip + URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4 DEPENDS dep_Boost dep_GMP dep_MPFR ) diff --git a/deps_src/CMakeLists.txt b/deps_src/CMakeLists.txt index 5c4e62b99f..11457c0d18 100644 --- a/deps_src/CMakeLists.txt +++ b/deps_src/CMakeLists.txt @@ -17,6 +17,7 @@ add_subdirectory(stb_dxt) # Header-only STB DXT compression library add_subdirectory(Shiny) add_subdirectory(admesh) add_subdirectory(clipper) +add_subdirectory(clipper2) add_subdirectory(expat) add_subdirectory(glu-libtess) add_subdirectory(hidapi) diff --git a/src/clipper2/CMakeLists.txt b/deps_src/clipper2/CMakeLists.txt similarity index 100% rename from src/clipper2/CMakeLists.txt rename to deps_src/clipper2/CMakeLists.txt diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.core.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.engine.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.export.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.minkowski.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.offset.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.rectclip.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper.version.h diff --git a/src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp b/deps_src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp similarity index 100% rename from src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp rename to deps_src/clipper2/Clipper2Lib/include/clipper2/clipper2_z.hpp diff --git a/src/clipper2/Clipper2Lib/src/clipper.engine.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper.engine.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper.engine.cpp diff --git a/src/clipper2/Clipper2Lib/src/clipper.offset.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper.offset.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper.offset.cpp diff --git a/src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper.rectclip.cpp diff --git a/src/clipper2/Clipper2Lib/src/clipper2_z.cpp b/deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp similarity index 100% rename from src/clipper2/Clipper2Lib/src/clipper2_z.cpp rename to deps_src/clipper2/Clipper2Lib/src/clipper2_z.cpp diff --git a/localization/i18n/en/OrcaSlicer_en.po b/localization/i18n/en/OrcaSlicer_en.po index 0cc2afa02e..647f62ee13 100644 --- a/localization/i18n/en/OrcaSlicer_en.po +++ b/localization/i18n/en/OrcaSlicer_en.po @@ -14346,7 +14346,7 @@ msgid "" "\n" "Using a non-zero value is useful if the printer is set up to print without a " "prime line.\n" -"Final number of loops is not taking into account while arranging or " +"Final number of loops is not taken into account while arranging or " "validating objects distance. Increase loop number in such case." msgstr "" diff --git a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po index d52a68ee1b..73fcdb50ea 100644 --- a/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po +++ b/localization/i18n/pt_BR/OrcaSlicer_pt_BR.po @@ -2057,7 +2057,7 @@ msgid "Replace the selected part with new STL" msgstr "Substituir a peça selecionada por novo STL" msgid "Replace all with STL" -msgstr "" +msgstr "Substituir tudo por STL" msgid "Replace all selected parts with STL from folder" msgstr "Substituir todas peças selecionadas com STL da pasta" @@ -3406,7 +3406,7 @@ msgid "Step" msgstr "Passo" msgid "Unmapped" -msgstr "" +msgstr "Não mapeado" msgid "" "Upper half area: Original\n" @@ -4267,7 +4267,7 @@ msgid "Auto Check: Material" msgstr "Verificação Automática: Material" msgid "Live View Camera Calibration" -msgstr "" +msgstr "Calibração da Câmera ao Vivo" msgid "Waiting for heatbed to reach target temperature" msgstr "Aguardando mesa aquecida atingir a temperatura desejada" @@ -6785,7 +6785,7 @@ msgid "Monitor if the waste is piled up in the purge chute." msgstr "Verifique se os resíduos estão se acumulando na calha de purga." msgid "Nozzle Clumping Detection" -msgstr "Detecção de acúmulo no bico" +msgstr "Detecção de Aglomeração no Bico" msgid "Check if the nozzle is clumping by filaments or other foreign objects." msgstr "" @@ -8037,10 +8037,12 @@ msgid "All" msgstr "Todos" msgid "Auto flush after changing..." -msgstr "" +msgstr "Auto purga depois da troca..." msgid "Auto calculate flushing volumes when selected values changed" msgstr "" +"Calcula automaticamente os volumes de purga quando os valores selecionados " +"são alterados" msgid "Auto arrange plate after cloning" msgstr "Organizar automaticamente a placa após a clonagem" @@ -8100,7 +8102,7 @@ msgid "If enabled, reverses the direction of zoom with mouse wheel." msgstr "Se ativo, inverte a direção de zoom com a roda do mouse." msgid "Clear my choice on..." -msgstr "" +msgstr "Limpar minha escolha em..." msgid "Unsaved projects" msgstr "Projetos não salvos" @@ -8158,7 +8160,7 @@ msgid "Update built-in Presets automatically." msgstr "Atualizar automaticamente Predefinições integradas." msgid "Network plugin" -msgstr "" +msgstr "Plugin de rede" msgid "Enable network plugin" msgstr "Ativar plugin de rede" @@ -8882,15 +8884,20 @@ msgid "" "You have selected both external and AMS filaments for an extruder. You will " "need to manually switch the external filament during printing." msgstr "" +"Você selecionou filamentos externos e AMS para uma extrusora. Será " +"necessário trocar manualmente o filamento externo durante a impressão." msgid "" "TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics " "calibration." -msgstr "" +msgstr "TPU 90A/TPU 85A é muito mole e não suporta calibração automática de " +"Dinâmica de Fluxo." msgid "" "Set dynamic flow calibration to 'OFF' to enable custom dynamic flow value." msgstr "" +"Desative a calibração de fluxo dinâmico para habilitar o valor de fluxo " +"dinâmico personalizado." msgid "This printer does not support printing all plates." msgstr "Esta impressora não suporta a imprimir todas as placas." @@ -8899,6 +8906,9 @@ msgid "" "Please cold pull before printing TPU to avoid clogging. You may use cold " "pull maintenance on the printer." msgstr "" +"Recomenda-se realizar um processo de 'cold pull' antes de imprimir em TPU " +"para evitar entupimentos. Você pode utilizar esse processo de manutenção na " +"impressora." msgid "High chamber temperature is required. Please close the door." msgstr "É necessária uma temperatura elevada na câmara. Feche a porta." @@ -8916,8 +8926,9 @@ msgid "click to retry" msgstr "clique para tentar novamente" msgid "Upload file timeout, please check if the firmware version supports it." -msgstr "Limite de tempo de envio exedido, verifique se a versão do firmware " -"tem suporte." +msgstr "" +"Limite de tempo de envio de arquivo excedido, verifique se a versão do " +"firmware tem suporte." msgid "" "No available external storage was obtained. Please confirm and try again." @@ -8936,6 +8947,8 @@ msgid "" "Please check the network and try again, You can restart or update the " "printer if the issue persists." msgstr "" +"Verifique a rede e tente novamente. Se o problema persistir, você pode " +"reiniciar ou atualizar a impressora." msgid "Sending..." msgstr "Enviando…" @@ -8952,7 +8965,7 @@ msgid "Sending failed, please try again!" msgstr "Falha no envio, tente novamente!" msgid "Connection failed. Click the icon to retry" -msgstr "" +msgstr "Falha na coexão. Clique no icon para tentar novamente" msgid "Cannot send the print task when the upgrade is in progress" msgstr "" @@ -9653,7 +9666,7 @@ msgid "Wipe tower parameters" msgstr "Parâmetros da torre de limpeza" msgid "Multi Filament" -msgstr "" +msgstr "Multi Filamento" msgid "Tool change parameters with single extruder MM printers" msgstr "" @@ -9723,7 +9736,7 @@ msgid "Timelapse G-code" msgstr "G-code de timelapse" msgid "Clumping Detection G-code" -msgstr "" +msgstr "G-code para detecção de aglomeração" msgid "Change filament G-code" msgstr "G-code de mudança de filamento" @@ -9862,11 +9875,11 @@ msgstr "Tem certeza de %1% a predefinição selecionada?" #, c-format, boost-format msgid "Left: %s" -msgstr "" +msgstr "Esquerda: %s" #, c-format, boost-format msgid "Right: %s" -msgstr "" +msgstr "Direita: %s" msgid "Click to reset current value and attach to the global value." msgstr "Clique para redefinir o valor atual e anexá-lo ao valor global." @@ -10102,25 +10115,25 @@ msgid "The configuration is up to date." msgstr "A configuração está atualizada." msgid "Open Wiki for more information >" -msgstr "" +msgstr "Abra o Wiki para mais informações >" msgid "OBJ file import color" msgstr "Importar cor de arquivo Obj" msgid "Some faces don't have color defined." -msgstr "" +msgstr "Algumas faces não têm a cor definida." msgid "MTL file exist error, could not find the material:" msgstr "" msgid "Please check OBJ or MTL file." -msgstr "" +msgstr "Verifique o arquivo OBJ ou MTL." msgid "Specify number of colors:" msgstr "Especifique a quantidade de cores:" msgid "Enter or click the adjustment button to modify number again" -msgstr "" +msgstr "Digite ou clique no botão de ajuste para modificar o número novamente" msgid "Recommended " msgstr "Recomendado " @@ -10129,10 +10142,10 @@ msgid "view" msgstr "" msgid "Current filament colors" -msgstr "" +msgstr "Cores de filamento atuais" msgid "Matching" -msgstr "" +msgstr "Correspondendo" msgid "Quick set" msgstr "" @@ -10147,7 +10160,7 @@ msgid "Append" msgstr "Adicionar" msgid "Append to existing filaments" -msgstr "" +msgstr "Adicionar aos filamentos existentes" msgid "Reset mapped extruders." msgstr "Redefinir extrusoras mapeadas." @@ -10389,6 +10402,9 @@ msgid "" "changed or filaments changed. You could disable the auto-calculate in Orca " "Slicer > Preferences" msgstr "" +"O Orca recalculará seus volumes de purga toda vez que a cor dos filamentos " +"ou os filamentos forem alterados. Você pode desativar o cálculo automático " +"em OrcaSlicer > Preferências" msgid "Flushing volume (mm³) for each filament pair." msgstr "Volume de purga (mm³) para cada par de filamentos." @@ -10405,10 +10421,10 @@ msgid "Re-calculate" msgstr "Recalcular" msgid "Left extruder" -msgstr "" +msgstr "Extrusora esquerda" msgid "Right extruder" -msgstr "" +msgstr "Extrusora direita" msgid "Multiplier" msgstr "Multiplicador" @@ -10417,7 +10433,7 @@ msgid "Flushing volumes for filament change" msgstr "Volumes de purga para troca de filamento" msgid "Please choose the filament colour" -msgstr "" +msgstr "Escolha a cor do filamento" msgid "" "Windows Media Player is required for this task! Do you want to enable " @@ -10732,19 +10748,27 @@ msgid "" "Try the following methods to update the connection parameters and reconnect " "to the printer." msgstr "" +"Tente os seguintes métodos para atualizar os parâmetros de conexão e " +"reconectar à impressora." msgid "1. Please confirm Orca Slicer and your printer are in the same LAN." msgstr "" +"1. Confirme se o Orca Slicer e sua impressora estão na mesma rede local." msgid "" "2. If the IP and Access Code below are different from the actual values on " "your printer, please correct them." msgstr "" +"2. Se o IP e o Código de Acesso abaixo forem diferentes dos valores reais da " +"sua impressora, corrija-os." msgid "" "3. Please obtain the device SN from the printer side; it is usually found in " "the device information on the printer screen." msgstr "" +"3. Obtenha o número de série (SN) do dispositivo na própria impressora; " +"geralmente ele pode ser encontrado nas informações do dispositivo na tela da " +"impressora." msgid "IP" msgstr "IP" @@ -10800,7 +10824,7 @@ msgstr "" "por favor passe para o passo 3 para resolver problemas de rede" msgid "Connection failed! Please refer to the wiki page." -msgstr "" +msgstr "Falha na conexão! Consulte a página da wiki." msgid "sending failed" msgstr "falha no envio" @@ -10809,9 +10833,11 @@ msgid "" "Failed to send. Click Retry to attempt sending again. If retrying does not " "work, please check the reason." msgstr "" +"Falha ao enviar. Clique em Tentar Novamente para tentar enviar de novo. Se " +"tentar novamente não funcionar, verifique o motivo." msgid "reconnect" -msgstr "" +msgstr "reconectar" msgid "Air Pump" msgstr "Bomba de Ar" @@ -10826,7 +10852,7 @@ msgid "Cutting Module" msgstr "Módulo de Corte" msgid "Auto Fire Extinguishing System" -msgstr "" +msgstr "Sistema Automático de Extinção de Incêndio" msgid "Model:" msgstr "Modelo:" @@ -10988,13 +11014,13 @@ msgid "Generating G-code: layer %1%" msgstr "Gerando G-code: camada %1%" msgid "Flush volumes matrix do not match to the correct size!" -msgstr "" +msgstr "A matriz de volumes de descarga não corresponde ao tamanho correto!" msgid "Grouping error: " -msgstr "" +msgstr "Erro de agrupamento: " msgid " can not be placed in the " -msgstr "" +msgstr " não pode ser colocado na " msgid "Inner wall" msgstr "Parede interna" @@ -11162,6 +11188,8 @@ msgid "" " is too close to clumping detection area, there may be collisions when " "printing." msgstr "" +" está muito perto da área de detecção de aglomeração, podendo haver colisões " +"durante a impressão." msgid "Prime Tower" msgstr "Torre de Preparo" @@ -11175,32 +11203,44 @@ msgstr " está muito perto da área de exclusão, e ocorrerão colisões.\n" msgid "" " is too close to clumping detection area, and collisions will be caused.\n" msgstr "" +" está muito perto da área de detecção de aglomeração, e ocorrerão colisões.\n" msgid "" "Printing high-temp and low-temp filaments together may cause nozzle clogging " "or printer damage." msgstr "" +"A impressão simultânea de filamentos de alta e baixa temperatura pode causar " +"entupimento do bico ou danos à impressora." msgid "" "Printing high-temp and low-temp filaments together may cause nozzle clogging " "or printer damage. If you still want to print, you can enable the option in " "Preferences." msgstr "" +"A impressão simultânea de filamentos de alta e baixa temperatura pode causar " +"entupimento do bico ou danos à impressora. Se ainda assim desejar imprimir, " +"você pode ativar a opção em Preferências." msgid "" "Printing different-temp filaments together may cause nozzle clogging or " "printer damage." msgstr "" +"Imprimir filamentos com temperaturas diferentes simultaneamente pode causar " +"entupimento dos bicos ou danos à impressora." msgid "" "Printing high-temp and mid-temp filaments together may cause nozzle clogging " "or printer damage." msgstr "" +"A impressão simultânea de filamentos de alta e média temperatura pode causar " +"entupimento do bico ou danos à impressora." msgid "" "Printing mid-temp and low-temp filaments together may cause nozzle clogging " "or printer damage." msgstr "" +"A impressão simultânea de filamentos de temperatura média e baixa pode causar " +"entupimento do bico ou danos à impressora." msgid "No extrusions under current settings." msgstr "Nenhuma extrusão com as configurações atuais." @@ -11215,6 +11255,8 @@ msgstr "" msgid "" "Clumping detection is not supported when \"by object\" sequence is enabled." msgstr "" +"A detecção de aglomeração não é suportada quando a sequência \"por objeto\" " +"está ativada." msgid "" "Prime tower is required for clumping detection; otherwise, there may be " @@ -11528,7 +11570,7 @@ msgid "Printable area" msgstr "Área de impressão" msgid "Extruder printable area" -msgstr "" +msgstr "Área de impressão da extrusora" msgid "Bed exclude area" msgstr "Área de exclusão da mesa" @@ -11590,12 +11632,14 @@ msgid "Maximum printable height which is limited by mechanism of printer." msgstr "Altura máxima de impressão limitada pelo mecanismo da impressora." msgid "Extruder printable height" -msgstr "" +msgstr "Altura de impressão da extrusora" msgid "" "Maximum printable height of this extruder which is limited by mechanism of " "printer." msgstr "" +"Altura máxima de impressão desta extrusora, limitada pelo mecanismo da " +"impressora." msgid "Preferred orientation" msgstr "Orientação preferida" @@ -14908,19 +14952,19 @@ msgstr "" "diâmetro do bico." msgid "Enable clumping detection" -msgstr "" +msgstr "Habilitar detecção de aglomeração" msgid "Clumping detection layers" -msgstr "" +msgstr "Camadas de detecção de aglomeração" msgid "Clumping detection layers." -msgstr "" +msgstr "Camadas de detecção de aglomeração." msgid "Probing exclude area of clumping" -msgstr "" +msgstr "Sondagem exclui área de aglomeração" msgid "Probing exclude area of clumping." -msgstr "" +msgstr "Sondagem exclui área de aglomeração." msgid "Filament to print internal sparse infill." msgstr "Filamento para imprimir preenchimento esparso interno." diff --git a/resources/handy_models/calicat.stl b/resources/handy_models/calicat.stl new file mode 100644 index 0000000000..3380af233b Binary files /dev/null and b/resources/handy_models/calicat.stl differ diff --git a/resources/images/advanced.svg b/resources/images/advanced.svg index 561a15b303..ef868e36b1 100644 --- a/resources/images/advanced.svg +++ b/resources/images/advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/ams_1_tray.svg b/resources/images/ams_1_tray.svg index 6d9c7b3f28..d46cb35b07 100644 --- a/resources/images/ams_1_tray.svg +++ b/resources/images/ams_1_tray.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/resources/images/ams_4_tray.svg b/resources/images/ams_4_tray.svg index 379dcdf991..779383ed27 100644 --- a/resources/images/ams_4_tray.svg +++ b/resources/images/ams_4_tray.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/resources/images/custom-gcode_advanced.svg b/resources/images/custom-gcode_advanced.svg index 561a15b303..e363a28d13 100644 --- a/resources/images/custom-gcode_advanced.svg +++ b/resources/images/custom-gcode_advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/four_slot_ams_item.svg b/resources/images/four_slot_ams_item.svg index b42e94a6ca..8b1f7f787b 100644 --- a/resources/images/four_slot_ams_item.svg +++ b/resources/images/four_slot_ams_item.svg @@ -1,5 +1 @@ - - - - - + \ No newline at end of file diff --git a/resources/images/four_slot_ams_item_dark.svg b/resources/images/four_slot_ams_item_dark.svg index 1d788268ff..8b1f7f787b 100644 --- a/resources/images/four_slot_ams_item_dark.svg +++ b/resources/images/four_slot_ams_item_dark.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/lock_hover.svg b/resources/images/lock_hover.svg index b25ba1cfdc..7abfb97480 100644 --- a/resources/images/lock_hover.svg +++ b/resources/images/lock_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/lock_normal.svg b/resources/images/lock_normal.svg index e585aba3f6..7abfb97480 100644 --- a/resources/images/lock_normal.svg +++ b/resources/images/lock_normal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/obj_variable_layer_height.svg b/resources/images/obj_variable_layer_height.svg new file mode 100644 index 0000000000..801d3e4ad2 --- /dev/null +++ b/resources/images/obj_variable_layer_height.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/page_down.svg b/resources/images/page_down.svg index 077526b5a7..7a9b362b61 100644 --- a/resources/images/page_down.svg +++ b/resources/images/page_down.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/images/page_up.svg b/resources/images/page_up.svg index 3a801242b2..d500df39a8 100644 --- a/resources/images/page_up.svg +++ b/resources/images/page_up.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/images/param_advanced.svg b/resources/images/param_advanced.svg index 86d13f71a7..d5bbb99a94 100644 --- a/resources/images/param_advanced.svg +++ b/resources/images/param_advanced.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/param_zig-zag.svg b/resources/images/param_zig-zag.svg deleted file mode 100644 index 0c062058bc..0000000000 --- a/resources/images/param_zig-zag.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/images/reset_gray.svg b/resources/images/reset_gray.svg index 9e5578903e..dea3f8dcc5 100644 --- a/resources/images/reset_gray.svg +++ b/resources/images/reset_gray.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/resources/images/revert_btn.svg b/resources/images/revert_btn.svg index 763a86ff76..ffcc5535f2 100644 --- a/resources/images/revert_btn.svg +++ b/resources/images/revert_btn.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/single_slot_ams_item.svg b/resources/images/single_slot_ams_item.svg index a1f94f84fc..edd4698500 100644 --- a/resources/images/single_slot_ams_item.svg +++ b/resources/images/single_slot_ams_item.svg @@ -1,12 +1 @@ - - - - - - - - - - - - + \ No newline at end of file diff --git a/resources/images/single_slot_ams_item_dark.svg b/resources/images/single_slot_ams_item_dark.svg index b259df0329..edd4698500 100644 --- a/resources/images/single_slot_ams_item_dark.svg +++ b/resources/images/single_slot_ams_item_dark.svg @@ -1,15 +1 @@ - - - - - - - - 第 1 层 - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/tab_multi_active.svg b/resources/images/tab_multi_active.svg index dc776469e5..a005848cee 100644 --- a/resources/images/tab_multi_active.svg +++ b/resources/images/tab_multi_active.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_double_directional_arrow.svg b/resources/images/toolbar_double_directional_arrow.svg index 4cc9b2ecb3..b2b52621a0 100644 --- a/resources/images/toolbar_double_directional_arrow.svg +++ b/resources/images/toolbar_double_directional_arrow.svg @@ -1,8 +1 @@ - - - - - - - - + \ No newline at end of file diff --git a/resources/images/toolbar_reset.svg b/resources/images/toolbar_reset.svg index ad78b43e15..ffcc5535f2 100644 --- a/resources/images/toolbar_reset.svg +++ b/resources/images/toolbar_reset.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_hover.svg b/resources/images/toolbar_reset_hover.svg index ad78b43e15..ffcc5535f2 100644 --- a/resources/images/toolbar_reset_hover.svg +++ b/resources/images/toolbar_reset_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero.svg b/resources/images/toolbar_reset_zero.svg index 10be9c46fc..07ce4a5fd2 100644 --- a/resources/images/toolbar_reset_zero.svg +++ b/resources/images/toolbar_reset_zero.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/toolbar_reset_zero_hover.svg b/resources/images/toolbar_reset_zero_hover.svg index 10be9c46fc..07ce4a5fd2 100644 --- a/resources/images/toolbar_reset_zero_hover.svg +++ b/resources/images/toolbar_reset_zero_hover.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/images/undo.svg b/resources/images/undo.svg index 763a86ff76..ffcc5535f2 100644 --- a/resources/images/undo.svg +++ b/resources/images/undo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json index 3ea31a77ae..2c42cc077b 100644 --- a/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json +++ b/resources/profiles/Anycubic/machine/Anycubic Kobra S1 0.4 nozzle.json @@ -41,7 +41,7 @@ "before_layer_change_gcode": "; BEFORE_LAYER_CHANGE [layer_num] @ [layer_z]mm", "best_object_pos": "0.5,0.5", "change_extrusion_role_gcode": "", - "change_filament_gcode": "", + "change_filament_gcode": "; FLUSH_START\n;;; M400 P0\nT[next_extruder] ; change extruder\n; 1\n;;; G90\n;;; G1 Z{toolchange_z+2} F480\n;;; G1 X261 Y25 F12000\n;;; G1 Y1 F600\n;;; M400 P2730\n;;; G1 Y25 F3000\n;;; M400 P76250\n;;; M400 P35780\n; 2.1\n;;; G90\n;;; G1 Z{toolchange_z+2} F480\n;;; G1 X47 Y230 F12000\n;;; M400 P0\n; 2.2\n;;; G1 X47 Y276 F600\n;;; G1 X47 Y230 F12000\n;;; G1 X47 Y276 F600\n;;; G1 X47 Y230 F12000\n; 3.1\n;;; G1 F36000\n;;; G1 Y250\n;;; G1 F8000\n;;; G1 X81\n;;; G1 Y273\n; 3.2\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 F8000\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n;;; G1 X96\n;;; G1 X81\n; 3.3\n;;; G1 X72\n;;; G1 X77\n;;; G1 Z{toolchange_z}\n;;; M400 P0\n; FLUSH_END", "cooling_tube_length": "0", "cooling_tube_retraction": "0", "deretraction_speed": [ @@ -228,4 +228,4 @@ "Slope Lift" ], "z_offset": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/M3D.json b/resources/profiles/M3D.json new file mode 100644 index 0000000000..6b77a142df --- /dev/null +++ b/resources/profiles/M3D.json @@ -0,0 +1,37 @@ +{ + "name": "M3D", + "version": "1.0.0", + "force_update": "0", + "description": "Configuration for M3D printers", + "machine_model_list": [ + { + "name": "M3D Enabler D8500 MM Model", + "sub_path": "machine/M3D Enabler D8500 MM Model.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "M3D Enabler D8500 MM", + "sub_path": "machine/M3D Enabler D8500 MM.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "0.15mm MM @D8500", + "sub_path": "process/0.15mm MM @D8500.json" + }, + { + "name": "0.20mm MM @D8500", + "sub_path": "process/0.20mm MM @D8500.json" + } + ], + "filament_list": [] +} \ No newline at end of file diff --git a/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png b/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png new file mode 100644 index 0000000000..eb067195cf Binary files /dev/null and b/resources/profiles/M3D/M3D Enabler D8500 MM Model_cover.png differ diff --git a/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json b/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json new file mode 100644 index 0000000000..1e8c6e9b89 --- /dev/null +++ b/resources/profiles/M3D/machine/M3D Enabler D8500 MM Model.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "M3D Enabler D8500 MM Model", + "model_id": "M3D_D8500_MM", + "family": "M3D", + "machine_tech": "FFF", + "nozzle_diameter": "0.4", + "bed_model": "model/M3D_bed_model.stl", + "bed_texture": "model/M3D_bed_texture.png", + "default_materials": "Generic PLA @system", + "scan_folder": "1" +} \ No newline at end of file diff --git a/resources/profiles/M3D/machine/M3D Enabler D8500 MM.json b/resources/profiles/M3D/machine/M3D Enabler D8500 MM.json new file mode 100644 index 0000000000..2bcfbfcdae --- /dev/null +++ b/resources/profiles/M3D/machine/M3D Enabler D8500 MM.json @@ -0,0 +1,166 @@ +{ + "type": "machine", + "name": "M3D Enabler D8500 MM", + "printer_model": "M3D Enabler D8500 MM Model", + "printer_variant": "0.4", + "inherits": "fdm_machine_common", + "from": "system", + "instantiation": "true", + "is_custom_defined": "0", + "setting_id": "M3D_D8500_MM_04", + "version": "1.0.0", + + "auxiliary_fan": "1", + "change_filament_gcode": "M18 E", + "deretraction_speed": [ + "50", + "50" + ], + "extruder_clearance_height_to_rod": "19", + "extruder_clearance_radius": "100", + "extruder_colour": [ + "#FCE94F", + "#FCE94F" + ], + "extruder_offset": [ + "0x0", + "0x0" + ], + "fan_speedup_time": "1", + "host_type": "esp3d", + "long_retractions_when_cut": [ + "0", + "0" + ], + "machine_end_gcode": "; ===== ORCA END GCODE =====\nM400\nM83\nG92 E0\nG1 E-17 F1800 ; retract BEFORE any moves or power changes\n\n; Now lift and park\nG91\nG1 Z2 F2000\nG90\nG1 X100 Y160 F3000 ; parking point\n\n; Power down in order\nM104 T0 S0\nM104 T1 S0\nM106 S50 ; keep fan at ~50% while cooling (adjust if desired)\n; (Leave steppers on by omitting M84)\n; ===== END ORCA END GCODE =====\n", + "machine_load_filament_time": "0.5", + "machine_max_acceleration_e": [ + "10000", + "10000" + ], + "machine_max_acceleration_x": [ + "2000", + "2000" + ], + "machine_max_acceleration_y": [ + "2000", + "2000" + ], + "machine_max_acceleration_z": [ + "400", + "400" + ], + "machine_max_speed_e": [ + "30", + "30" + ], + "machine_max_speed_x": [ + "400", + "400" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_start_gcode": "; ===== ORCA START GCODE =====\n; minx:{first_layer_print_min[0]}\n; miny:{first_layer_print_min[1]}\n; maxx:{first_layer_print_max[0]}\n; maxy:{first_layer_print_max[1]}\n; used_0:{is_extruder_used[0]}\n; used_1:{is_extruder_used[1]}\n\n; Heaters\n{if is_extruder_used[0]}M104 T0 S{first_layer_temperature[0]}{endif}\n{if !is_extruder_used[0]}M104 T0 S150{endif}\n{if is_extruder_used[1]}M104 T1 S{first_layer_temperature[1]}{endif}\n{if !is_extruder_used[1]}M104 T1 S150{endif}\nM140 S0\nM106 S50\n\n; Home and clearance\nG28 X Y\nG28 Z\nG91\nG1 Z10 F1200 ; lift 10mm\nG90\n\n; Bed wait (dummy)\nM190 S0\n\n; Wait for target temps\n{if is_extruder_used[0]}M109 T0 S{first_layer_temperature[0]}{endif}\n{if is_extruder_used[1]}M109 T1 S{first_layer_temperature[1]}{endif}\n\n; Absolute XYZ / Relative E\nG90\nM83\n\n; ===== Dynamic Bed Leveling ====\nT0\nG1 Z3 F3000\nG1 X15 Y15 F6000\nG1 Z0.25 F1000; Otherwise Orca displays with a 3mm height\n; Single probe touch\nG30\nM420 S1\n; Bias the contact as -0.25 and fix Z-zero\nG92 Z-0.25 ; probed contact now treated as Z = -0.25\nG1 Z0.3 F300\n\n; ===== PRIME / TWO-LINE WIPES (sparse, no air extrude) =====\n\n; --- Tool 0: lines at Y=5 and Y=6 ---\n{if is_extruder_used[0]}\nT0\nG92 E0\nG1 X20 Y5 F3000\nG1 Z0.30 F600\nG1 X180 E18 F700\nG1 Y6.0 F1200\nG1 X20 E18 F700\nG92 E0\n{endif}\n\n; --- Tool 1: lines at Y=7 and Y=8 ---\n{if is_extruder_used[1]}\nT1\nG92 E0\nG1 X20 Y7 F3000\nG1 Z0.30 F600\nG1 X180 E18 F700\nG1 Y8.0 F1200\nG1 X20 E18 F700\nG92 E0\n{endif}\n\n; Activate initial tool (no retracts; Orca starts immediately)\nT{initial_extruder}\nG92 E0\n; ===== END ORCA START GCODE =====\n", + "machine_tool_change_time": "0.5", + "machine_unload_filament_time": "0.5", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "machine_pause_gcode": "M601", + "max_layer_height": [ + "0.32", + "0.32" + ], + "min_layer_height": [ + "0.1", + "0.1" + ], + "nozzle_diameter": [ + "0.4", + "0.4" + ], + "nozzle_type": "brass", + "print_host": "m3d-enabler.local", + "printable_area": [ + "0x0", + "210x0", + "210x150", + "0x150" + ], + "printer_settings_id": "M3D Enabler D8500 MM", + "retract_before_wipe": [ + "100%", + "100%" + ], + "retract_length_toolchange": [ + "17", + "17" + ], + "retract_lift_above": [ + "0", + "0" + ], + "retract_lift_below": [ + "0", + "0" + ], + "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces" + ], + "retract_restart_extra": [ + "0", + "0" + ], + "retract_restart_extra_toolchange": [ + "0", + "0" + ], + "retract_when_changing_layer": [ + "1", + "1" + ], + "retraction_distances_when_cut": [ + "18", + "18" + ], + "retraction_length": [ + "4.5", + "4.5" + ], + "retraction_minimum_travel": [ + "2.5", + "2.5" + ], + "retraction_speed": [ + "60", + "60" + ], + "single_extruder_multi_material": "0", + "thumbnails": "120x60/PNG", + "travel_slope": [ + "45", + "45" + ], + "wipe": [ + "1", + "1" + ], + "wipe_distance": [ + "2", + "2" + ], + "z_hop": [ + "0", + "0" + ], + "z_hop_types": [ + "Normal Lift", + "Normal Lift" + ] +} \ No newline at end of file diff --git a/resources/profiles/M3D/machine/fdm_machine_common.json b/resources/profiles/M3D/machine/fdm_machine_common.json new file mode 100644 index 0000000000..9132e65373 --- /dev/null +++ b/resources/profiles/M3D/machine/fdm_machine_common.json @@ -0,0 +1,126 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "printer_settings_id": "fdm_machine_common", + "version": "1.0.0.0", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "210x0", + "210x150", + "0x150" + ], + "thumbnails": [ + "16x16" + ], + "auxiliary_fan": "1", + "change_filament_gcode": "M18 E", + "deretraction_speed": [ + "50" + ], + "extruder_clearance_height_to_rod": "19", + "extruder_clearance_radius": "100", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_speedup_time": "1", + "host_type": "esp3d", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "; ===== ORCA END GCODE =====\nM400\nM83\nG92 E0\nG1 E-17 F1800 ; retract BEFORE any moves or power changes\n\n; Now lift and park\nG91\nG1 Z2 F2000\nG90\nG1 X100 Y160 F3000 ; parking point\n\n; Power down in order\nM104 T0 S0\nM104 T1 S0\nM106 S50 ; keep fan at ~50% while cooling (adjust if desired)\n; (Leave steppers on by omitting M84)\n; ===== END ORCA END GCODE =====\n", + "machine_load_filament_time": "0.5", + "machine_max_acceleration_e": [ + "10000" + ], + "machine_max_acceleration_x": [ + "2000" + ], + "machine_max_acceleration_y": [ + "2000" + ], + "machine_max_acceleration_z": [ + "400" + ], + "machine_max_speed_e": [ + "30" + ], + "machine_max_speed_x": [ + "400" + ], + "machine_max_speed_y": [ + "300" + ], + "machine_max_speed_z": [ + "12" + ], + "machine_start_gcode": "; ===== ORCA START GCODE =====\n; minx:{first_layer_print_min[0]}\n; miny:{first_layer_print_min[1]}\n; maxx:{first_layer_print_max[0]}\n; maxy:{first_layer_print_max[1]}\n; used_0:{is_extruder_used[0]}\n; used_1:{is_extruder_used[1]}\n\n; Heaters\n{if is_extruder_used[0]}M104 T0 S{first_layer_temperature[0]}{endif}\n{if !is_extruder_used[0]}M104 T0 S150{endif}\n{if is_extruder_used[1]}M104 T1 S{first_layer_temperature[1]}{endif}\n{if !is_extruder_used[1]}M104 T1 S150{endif}\nM140 S0\nM106 S50\n\n; Home and clearance\nG28 X Y\nG28 Z\nG91\nG1 Z10 F1200 ; lift 10mm\nG90\n\n; Bed wait (dummy)\nM190 S0\n\n; Wait for target temps\n{if is_extruder_used[0]}M109 T0 S{first_layer_temperature[0]}{endif}\n{if is_extruder_used[1]}M109 T1 S{first_layer_temperature[1]}{endif}\n\n; Absolute XYZ / Relative E\nG90\nM83\n\n; ===== Dynamic Bed Leveling ====\nT0\nG1 Z3 F3000\nG1 X15 Y15 F6000\nG1 Z0.25 F1000; Otherwise Orca displays with a 3mm height\n; Single probe touch\nG30\nM420 S1\n; Bias the contact as -0.25 and fix Z-zero\nG92 Z-0.25 ; probed contact now treated as Z = -0.25\nG1 Z0.3 F300\n\n; ===== PRIME / TWO-LINE WIPES (sparse, no air extrude) =====\n\n; --- Tool 0: lines at Y=5 and Y=6 ---\n{if is_extruder_used[0]}\nT0\nG92 E0\nG1 X20 Y5 F3000\nG1 Z0.30 F600\nG1 X180 E18 F700\nG1 Y6.0 F1200\nG1 X20 E18 F700\nG92 E0\n{endif}\n\n; --- Tool 1: lines at Y=7 and Y=8 ---\n{if is_extruder_used[1]}\nT1\nG92 E0\nG1 X20 Y7 F3000\nG1 Z0.30 F600\nG1 X180 E18 F700\nG1 Y8.0 F1200\nG1 X20 E18 F700\nG92 E0\n{endif}\n\n; Activate initial tool (no retracts; Orca starts immediately)\nT{initial_extruder}\nG92 E0\n; ===== END ORCA START GCODE =====\n", + "machine_tool_change_time": "0.5", + "machine_unload_filament_time": "0.5", + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.1" + ], + "retract_before_wipe": [ + "100%" + ], + "retract_length_toolchange": [ + "17" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "0" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "18" + ], + "retraction_length": [ + "4.5" + ], + "retraction_minimum_travel": [ + "2.5" + ], + "retraction_speed": [ + "60" + ], + "single_extruder_multi_material": "0", + "travel_slope": [ + "45" + ], + "wipe": [ + "1" + ], + "wipe_distance": [ + "2" + ], + "z_hop": [ + "0" + ], + "z_hop_types": [ + "Normal Lift" + ] +} \ No newline at end of file diff --git a/resources/profiles/M3D/model/M3D_bed_model.stl b/resources/profiles/M3D/model/M3D_bed_model.stl new file mode 100644 index 0000000000..8ed24335dd Binary files /dev/null and b/resources/profiles/M3D/model/M3D_bed_model.stl differ diff --git a/resources/profiles/M3D/model/M3D_bed_texture.png b/resources/profiles/M3D/model/M3D_bed_texture.png new file mode 100644 index 0000000000..bd0e6b8b80 Binary files /dev/null and b/resources/profiles/M3D/model/M3D_bed_texture.png differ diff --git a/resources/profiles/M3D/process/0.15mm MM @D8500.json b/resources/profiles/M3D/process/0.15mm MM @D8500.json new file mode 100644 index 0000000000..ada09ff7ab --- /dev/null +++ b/resources/profiles/M3D/process/0.15mm MM @D8500.json @@ -0,0 +1,45 @@ +{ + "type": "process", + "name": "0.15mm MM @D8500", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "compatible_printers": [ + "M3D Enabler D8500 MM" + ], + "brim_type": "no_brim", + "support_object_first_layer_gap": "1", + "support_object_xy_distance": "0.5", + "bridge_acceleration": "50%", + "default_acceleration": "1000", + "initial_layer_acceleration": "500", + "inner_wall_acceleration": "1000", + "internal_solid_infill_acceleration": "100%", + "outer_wall_acceleration": "1000", + "sparse_infill_acceleration": "100%", + "top_surface_acceleration": "1000", + "travel_acceleration": "1000", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "1", + "filename_format": "{input_filename_base}_{print_time}.gcode", + "gap_infill_speed": "60", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.4", + "inner_wall_speed": "90", + "internal_solid_infill_speed": "60", + "layer_height": "0.15", + "outer_wall_speed": "45", + "prime_tower_brim_width": "1", + "prime_tower_width": "40", + "prime_volume": "30", + "slow_down_layers": "1", + "sparse_infill_density": "5%", + "sparse_infill_speed": "60", + "support_interface_speed": "30", + "support_type": "normal(manual)", + "travel_speed": "100", + "wall_loops": "2", + "wipe_tower_extra_spacing": "200%", + "wipe_tower_filament": "2" +} \ No newline at end of file diff --git a/resources/profiles/M3D/process/0.20mm MM @D8500.json b/resources/profiles/M3D/process/0.20mm MM @D8500.json new file mode 100644 index 0000000000..a2e2bd5a6a --- /dev/null +++ b/resources/profiles/M3D/process/0.20mm MM @D8500.json @@ -0,0 +1,46 @@ +{ + "type": "process", + "name": "0.20mm MM @D8500", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "compatible_printers": [ + "M3D Enabler D8500 MM" + ], + "brim_type": "no_brim", + "support_object_first_layer_gap": "1", + "support_object_xy_distance": "0.5", + "bridge_acceleration": "50%", + "default_acceleration": "1000", + "initial_layer_acceleration": "500", + "inner_wall_acceleration": "1000", + "internal_solid_infill_acceleration": "100%", + "outer_wall_acceleration": "1000", + "sparse_infill_acceleration": "100%", + "top_surface_acceleration": "1000", + "travel_acceleration": "1000", + "enable_overhang_speed": "1", + "enable_prime_tower": "1", + "enable_support": "1", + "filename_format": "{input_filename_base}_{print_time}.gcode", + "gap_infill_speed": "60", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.4", + "inner_wall_speed": "90", + "internal_solid_infill_speed": "60", + "layer_height": "0.2", + "outer_wall_speed": "45", + "prime_tower_brim_width": "1", + "prime_tower_width": "40", + "prime_volume": "30", + "slow_down_layers": "1", + "sparse_infill_density": "5%", + "sparse_infill_speed": "60", + "support_interface_speed": "30", + "support_type": "normal(manual)", + "top_surface_speed": "40", + "travel_speed": "100", + "wall_loops": "2", + "wipe_tower_extra_spacing": "200%", + "wipe_tower_filament": "2" +} \ No newline at end of file diff --git a/resources/profiles/M3D/process/fdm_process_common.json b/resources/profiles/M3D/process/fdm_process_common.json new file mode 100644 index 0000000000..ac39c20dde --- /dev/null +++ b/resources/profiles/M3D/process/fdm_process_common.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "brim_type": "no_brim", + "enable_overhang_speed": "0", + "enable_prime_tower": "1", + "enable_support": "1", + "filename_format": "{input_filename_base}_{print_time}.gcode", + "gap_infill_speed": "60", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.4", + "inner_wall_speed": "90", + "internal_solid_infill_speed": "60", + "outer_wall_speed": "45", + "prime_tower_brim_width": "1", + "prime_tower_width": "40", + "prime_volume": "30", + "slow_down_layers": "1", + "sparse_infill_density": "5%", + "sparse_infill_speed": "60", + "support_interface_speed": "30", + "support_type": "normal(manual)", + "top_surface_speed": "40", + "travel_speed": "100", + "wall_loops": "2", + "wipe_tower_extra_spacing": "200%", + "wipe_tower_filament": "2" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE.json b/resources/profiles/OpenEYE.json new file mode 100644 index 0000000000..b3bd6496dd --- /dev/null +++ b/resources/profiles/OpenEYE.json @@ -0,0 +1,198 @@ +{ + "name": "OpenEYE", + "url": "http://www.openeye.tech", + "version": "01.00.00.03", + "force_update": "0", + "description": "OpenEYE Printers Configurations", + "machine_model_list": [ + { + "name": "OpenEYE Peacock V2", + "sub_path": "machine/OpenEYE Peacock V2.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "fdm_process_openeye_common", + "sub_path": "process/fdm_process_openeye_common.json" + }, + { + "name": "fdm_process_openeye_0.06_nozzle_0.2", + "sub_path": "process/fdm_process_openeye_0.06_nozzle_0.2.json" + }, + { + "name": "fdm_process_openeye_0.08_nozzle_0.4", + "sub_path": "process/fdm_process_openeye_0.08_nozzle_0.4.json" + }, + { + "name": "fdm_process_openeye_0.08_nozzle_0.2", + "sub_path": "process/fdm_process_openeye_0.08_nozzle_0.2.json" + }, + { + "name": "fdm_process_openeye_0.10_nozzle_0.2", + "sub_path": "process/fdm_process_openeye_0.10_nozzle_0.2.json" + }, + { + "name": "fdm_process_openeye_0.12_nozzle_0.4", + "sub_path": "process/fdm_process_openeye_0.12_nozzle_0.4.json" + }, + { + "name": "fdm_process_openeye_0.12_nozzle_0.2", + "sub_path": "process/fdm_process_openeye_0.12_nozzle_0.2.json" + }, + { + "name": "fdm_process_openeye_0.14_nozzle_0.2", + "sub_path": "process/fdm_process_openeye_0.14_nozzle_0.2.json" + }, + { + "name": "fdm_process_openeye_0.16_nozzle_0.4", + "sub_path": "process/fdm_process_openeye_0.16_nozzle_0.4.json" + }, + { + "name": "fdm_process_openeye_0.18_nozzle_0.6", + "sub_path": "process/fdm_process_openeye_0.18_nozzle_0.6.json" + }, + { + "name": "fdm_process_openeye_0.20_nozzle_0.4", + "sub_path": "process/fdm_process_openeye_0.20_nozzle_0.4.json" + }, + { + "name": "fdm_process_openeye_0.24_nozzle_0.4", + "sub_path": "process/fdm_process_openeye_0.24_nozzle_0.4.json" + }, + { + "name": "fdm_process_openeye_0.24_nozzle_0.6", + "sub_path": "process/fdm_process_openeye_0.24_nozzle_0.6.json" + }, + { + "name": "fdm_process_openeye_0.24_nozzle_0.8", + "sub_path": "process/fdm_process_openeye_0.24_nozzle_0.8.json" + }, + { + "name": "fdm_process_openeye_0.28_nozzle_0.4", + "sub_path": "process/fdm_process_openeye_0.28_nozzle_0.4.json" + }, + { + "name": "fdm_process_openeye_0.30_nozzle_0.6", + "sub_path": "process/fdm_process_openeye_0.30_nozzle_0.6.json" + }, + { + "name": "fdm_process_openeye_0.32_nozzle_0.8", + "sub_path": "process/fdm_process_openeye_0.32_nozzle_0.8.json" + }, + { + "name": "fdm_process_openeye_0.36_nozzle_0.6", + "sub_path": "process/fdm_process_openeye_0.36_nozzle_0.6.json" + }, + { + "name": "fdm_process_openeye_0.40_nozzle_0.8", + "sub_path": "process/fdm_process_openeye_0.40_nozzle_0.8.json" + }, + { + "name": "fdm_process_openeye_0.42_nozzle_0.6", + "sub_path": "process/fdm_process_openeye_0.42_nozzle_0.6.json" + }, + { + "name": "fdm_process_openeye_0.48_nozzle_0.8", + "sub_path": "process/fdm_process_openeye_0.48_nozzle_0.8.json" + }, + { + "name": "fdm_process_openeye_0.56_nozzle_0.8", + "sub_path": "process/fdm_process_openeye_0.56_nozzle_0.8.json" + }, + { + "name": "0.08mm Extra Fine @OpenEYE Peacock V2 0.2 nozzle", + "sub_path": "process/0.08mm Extra Fine @OpenEYE Peacock V2 0.2 nozzle.json" + }, + { + "name": "0.08mm Extra Fine @OpenEYE Peacock V2", + "sub_path": "process/0.08mm Extra Fine @OpenEYE Peacock V2.json" + }, + { + "name": "0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle", + "sub_path": "process/0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle.json" + }, + { + "name": "0.12mm Balanced Quality @OpenEYE Peacock V2 0.2 nozzle", + "sub_path": "process/0.12mm Balanced Quality @OpenEYE Peacock V2 0.2 nozzle.json" + }, + { + "name": "0.12mm Fine @OpenEYE Peacock V2", + "sub_path": "process/0.12mm Fine @OpenEYE Peacock V2.json" + }, + { + "name": "0.16mm Balanced Quality @OpenEYE Peacock V2", + "sub_path": "process/0.16mm Balanced Quality @OpenEYE Peacock V2.json" + }, + { + "name": "0.16mm Standard @OpenEYE Peacock V2", + "sub_path": "process/0.16mm Standard @OpenEYE Peacock V2.json" + }, + { + "name": "0.18mm Balanced Quality @OpenEYE Peacock V2 0.6 nozzle", + "sub_path": "process/0.18mm Balanced Quality @OpenEYE Peacock V2 0.6 nozzle.json" + }, + { + "name": "0.20mm Balanced Strength @OpenEYE Peacock V2", + "sub_path": "process/0.20mm Balanced Strength @OpenEYE Peacock V2.json" + }, + { + "name": "0.20mm Standard @OpenEYE Peacock V2", + "sub_path": "process/0.20mm Standard @OpenEYE Peacock V2.json" + }, + { + "name": "0.24mm Balanced Quality @OpenEYE Peacock V2 0.8 nozzle", + "sub_path": "process/0.24mm Balanced Quality @OpenEYE Peacock V2 0.8 nozzle.json" + }, + { + "name": "0.24mm Balanced Strength @OpenEYE Peacock V2 0.6 nozzle", + "sub_path": "process/0.24mm Balanced Strength @OpenEYE Peacock V2 0.6 nozzle.json" + }, + { + "name": "0.24mm Standard @OpenEYE Peacock V2", + "sub_path": "process/0.24mm Standard @OpenEYE Peacock V2.json" + }, + { + "name": "0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle", + "sub_path": "process/0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle.json" + }, + { + "name": "0.32mm Balanced Strength @OpenEYE Peacock V2 0.8 nozzle", + "sub_path": "process/0.32mm Balanced Strength @OpenEYE Peacock V2 0.8 nozzle.json" + }, + { + "name": "0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle", + "sub_path": "process/0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle.json" + } + ], + "filament_list": [], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "fdm_openeye_common", + "sub_path": "machine/fdm_openeye_common.json" + }, + { + "name": "OpenEYE Peacock V2 0.4 nozzle", + "sub_path": "machine/OpenEYE Peacock V2 0.4 nozzle.json" + }, + { + "name": "OpenEYE Peacock V2 0.2 nozzle", + "sub_path": "machine/OpenEYE Peacock V2 0.2 nozzle.json" + }, + { + "name": "OpenEYE Peacock V2 0.6 nozzle", + "sub_path": "machine/OpenEYE Peacock V2 0.6 nozzle.json" + }, + { + "name": "OpenEYE Peacock V2 0.8 nozzle", + "sub_path": "machine/OpenEYE Peacock V2 0.8 nozzle.json" + } + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png b/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png new file mode 100644 index 0000000000..394f42c693 Binary files /dev/null and b/resources/profiles/OpenEYE/OpenEYE Peacock V2_cover.png differ diff --git a/resources/profiles/OpenEYE/Plate.stl b/resources/profiles/OpenEYE/Plate.stl new file mode 100644 index 0000000000..c57b67b0aa Binary files /dev/null and b/resources/profiles/OpenEYE/Plate.stl differ diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.2 nozzle.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.2 nozzle.json new file mode 100644 index 0000000000..1c427d38c2 --- /dev/null +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.2 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "machine", + "name": "OpenEYE Peacock V2 0.2 nozzle", + "inherits": "OpenEYE Peacock V2 0.4 nozzle", + "from": "system", + "setting_id": "GM002", + "instantiation": "true", + "nozzle_diameter": [ + "0.2" + ], + "printer_model": "OpenEYE Peacock V2", + "printer_variant": "0.2", + "default_print_profile": "0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle", + "default_bed_type": "Textured PEI Plate", + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.04" + ], + "retraction_length": [ + "0.4" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json new file mode 100644 index 0000000000..4528b72fe1 --- /dev/null +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.4 nozzle.json @@ -0,0 +1,48 @@ +{ + "default_print_profile": "0.20mm Standard @OpenEYE Peacock V2", + "default_bed_type": "Textured PEI Plate", + "from": "system", + "inherits": "fdm_openeye_common", + "instantiation": "true", + "layer_change_gcode": "SET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}\n_MMU_UPDATE_HEIGHT", + "machine_end_gcode": "MMU_END\nEND_PRINT", + "machine_load_filament_time": "30", + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "500", + "500" + ], + "machine_max_speed_y": [ + "500", + "500" + ], + "machine_max_speed_z": [ + "30", + "30" + ], + "machine_pause_gcode": "PAUSE", + "machine_start_gcode": "SET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nMMU_START_SETUP INITIAL_TOOL={initial_tool} TOTAL_TOOLCHANGES=!total_toolchanges! REFERENCED_TOOLS=!referenced_tools! TOOL_COLORS=!colors! TOOL_TEMPS=!temperatures! TOOL_MATERIALS=!materials! FILAMENT_NAMES=!filament_names! PURGE_VOLUMES=!purge_volumes!\nMMU_START_CHECK\nSTART_PRINT BED_TEMP=[bed_temperature_initial_layer] EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TYPE=\"{curr_bed_type}\"\n; Enter YOUR exist start_print macro call here (minus purging logic because tool may not be loaded yet)\nMMU_START_LOAD_INITIAL_TOOL\n; Optionally add YOUR additional start logic (like purging) here to run just prior to start\nSTART_PRINT_SECONDARY\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} ; For pause at layer functionality and better print stats", + "machine_unload_filament_time": "30", + "name": "OpenEYE Peacock V2 0.4 nozzle", + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "1.5x7", + "235x7", + "235x235", + "1.5x235" + ], + "printable_height": "200", + "printer_model": "OpenEYE Peacock V2", + "printer_variant": "0.4", + "retract_lift_below": [ + "180", + "180" + ], + "setting_id": "GM001", + "type": "machine" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.6 nozzle.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.6 nozzle.json new file mode 100644 index 0000000000..aa78fa17ab --- /dev/null +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.6 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "machine", + "name": "OpenEYE Peacock V2 0.6 nozzle", + "inherits": "OpenEYE Peacock V2 0.4 nozzle", + "from": "system", + "setting_id": "GM003", + "instantiation": "true", + "nozzle_diameter": [ + "0.6" + ], + "printer_model": "OpenEYE Peacock V2", + "printer_variant": "0.6", + "default_print_profile": "0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle", + "default_bed_type": "Textured PEI Plate", + "max_layer_height": [ + "0.42" + ], + "min_layer_height": [ + "0.12" + ], + "retraction_length": [ + "1.4" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.8 nozzle.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.8 nozzle.json new file mode 100644 index 0000000000..ef5c46aed3 --- /dev/null +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2 0.8 nozzle.json @@ -0,0 +1,24 @@ +{ + "type": "machine", + "name": "OpenEYE Peacock V2 0.8 nozzle", + "inherits": "OpenEYE Peacock V2 0.4 nozzle", + "from": "system", + "setting_id": "GM004", + "instantiation": "true", + "nozzle_diameter": [ + "0.8" + ], + "printer_model": "OpenEYE Peacock V2", + "printer_variant": "0.8", + "default_print_profile": "0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle", + "default_bed_type": "Textured PEI Plate", + "max_layer_height": [ + "0.56" + ], + "min_layer_height": [ + "0.16" + ], + "retraction_length": [ + "3" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json new file mode 100644 index 0000000000..44b78a7450 --- /dev/null +++ b/resources/profiles/OpenEYE/machine/OpenEYE Peacock V2.json @@ -0,0 +1,13 @@ +{ + "type": "machine_model", + "name": "OpenEYE Peacock V2", + "nozzle_diameter": "0.4;0.2;0.6;0.8", + "url": "http://www.openeye.tech", + "bed_model": "Plate.stl", + "bed_texture": "pei.png", + "default_bed_type": "Textured PEI Plate", + "family": "OpenEYE", + "machine_tech": "FFF", + "model_id": "openeye_01", + "default_materials": "Generic ABS @System;Generic PLA @System;Generic PLA-CF @System;Generic PETG @System;Generic TPU @System;Generic ASA @System;Generic PC @System;Generic PVA @System;Generic PA @System;Generic PA-CF @System" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/machine/fdm_machine_common.json b/resources/profiles/OpenEYE/machine/fdm_machine_common.json new file mode 100644 index 0000000000..7a32c1630a --- /dev/null +++ b/resources/profiles/OpenEYE/machine/fdm_machine_common.json @@ -0,0 +1,121 @@ +{ + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "best_object_pos": "0.5x0.5", + "change_filament_gcode": "", + "default_filament_profile": [], + "default_print_profile": "", + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "140", + "extruder_clearance_height_to_rod": "34", + "extruder_clearance_radius": "65", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "from": "system", + "gcode_flavor": "marlin", + "instantiation": "false", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end", + "machine_max_acceleration_e": [ + "5000" + ], + "machine_max_acceleration_extruding": [ + "10000" + ], + "machine_max_acceleration_retracting": [ + "1000" + ], + "machine_max_acceleration_x": [ + "10000" + ], + "machine_max_acceleration_y": [ + "10000" + ], + "machine_max_acceleration_z": [ + "100" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "8" + ], + "machine_max_jerk_y": [ + "8" + ], + "machine_max_jerk_z": [ + "3" + ], + "machine_max_speed_e": [ + "60" + ], + "machine_max_speed_x": [ + "500" + ], + "machine_max_speed_y": [ + "500" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "machine_pause_gcode": "M601", + "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\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 X110 Y110 Z2.0 F3000 ;Move Z Axis up", + "max_layer_height": [ + "0.28" + ], + "min_layer_height": [ + "0.08" + ], + "name": "fdm_machine_common", + "nozzle_diameter": [ + "0.4" + ], + "printable_height": "250", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retract_before_wipe": [ + "70%" + ], + "retract_length_toolchange": [ + "1" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "5" + ], + "retraction_minimum_travel": [ + "2" + ], + "retraction_speed": [ + "60" + ], + "silent_mode": "0", + "single_extruder_multi_material": "1", + "type": "machine", + "wipe": [ + "1" + ], + "z_hop": [ + "0" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/machine/fdm_openeye_common.json b/resources/profiles/OpenEYE/machine/fdm_openeye_common.json new file mode 100644 index 0000000000..130e3b189f --- /dev/null +++ b/resources/profiles/OpenEYE/machine/fdm_openeye_common.json @@ -0,0 +1,226 @@ +{ + "adaptive_bed_mesh_margin": "0", + "auxiliary_fan": "0", + "bed_exclude_area": [ + "0x0" + ], + "bed_mesh_max": "99999,99999", + "bed_mesh_min": "-99999,-99999", + "bed_mesh_probe_distance": "50,50", + "bed_temperature_formula": "by_highest_temp", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\nTIMELAPSE_TAKE_FRAME", + "best_object_pos": "0.5,0.5", + "change_filament_gcode": "", + "cooling_tube_length": "0", + "cooling_tube_retraction": "0", + "default_bed_type": "Textured PEI Plate", + "default_filament_profile": [ + "Generic PLA @System" + ], + "default_print_profile": "0.20mm Standard @OpenEYE Peacock V2", + "deretraction_speed": [ + "30" + ], + "disable_m73": "0", + "emit_machine_limits_to_gcode": "0", + "enable_filament_ramming": "0", + "enable_long_retraction_when_cut": "0", + "extra_loading_move": "0", + "extruder_clearance_height_to_lid": "34", + "extruder_clearance_height_to_rod": "34", + "extruder_clearance_radius": "47", + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "fan_kickstart": "0", + "fan_speedup_overhangs": "1", + "fan_speedup_time": "0", + "from": "system", + "gcode_flavor": "klipper", + "head_wrap_detect_zone": [], + "high_current_on_filament_swap": "0", + "host_type": "octoprint", + "inherits": "fdm_machine_common", + "instantiation": "false", + "layer_change_gcode": "SET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}\n_MMU_UPDATE_HEIGHT", + "long_retractions_when_cut": [ + "0" + ], + "machine_end_gcode": "MMU_END\nEND_PRINT", + "machine_load_filament_time": "0", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "machine_max_junction_deviation": [ + "0", + "0" + ], + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "500", + "500" + ], + "machine_max_speed_y": [ + "500", + "500" + ], + "machine_max_speed_z": [ + "30", + "30" + ], + "machine_min_extruding_rate": [ + "0", + "0" + ], + "machine_min_travel_rate": [ + "0", + "0" + ], + "machine_pause_gcode": "PAUSE", + "machine_start_gcode": "SET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nMMU_START_SETUP INITIAL_TOOL={initial_tool} TOTAL_TOOLCHANGES=!total_toolchanges! REFERENCED_TOOLS=!referenced_tools! TOOL_COLORS=!colors! TOOL_TEMPS=!temperatures! TOOL_MATERIALS=!materials! FILAMENT_NAMES=!filament_names! PURGE_VOLUMES=!purge_volumes!\nMMU_START_CHECK\nSTART_PRINT BED_TEMP=[bed_temperature_initial_layer] EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TYPE=\"{curr_bed_type}\"\n; Enter YOUR exist start_print macro call here (minus purging logic because tool may not be loaded yet)\nMMU_START_LOAD_INITIAL_TOOL\n; Optionally add YOUR additional start logic (like purging) here to run just prior to start\nSTART_PRINT_SECONDARY\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} ; For pause at layer functionality and better print stats", + "machine_tool_change_time": "0", + "machine_unload_filament_time": "0", + "manual_filament_change": "0", + "max_layer_height": [ + "0.28" + ], + "max_resonance_avoidance_speed": "120", + "min_layer_height": [ + "0.08" + ], + "min_resonance_avoidance_speed": "70", + "name": "fdm_openeye_common", + "nozzle_diameter": [ + "0.4", + "0.4" + ], + "nozzle_height": "2.5", + "nozzle_hrc": "0", + "nozzle_type": "brass", + "nozzle_volume": "0", + "parking_pos_retraction": "0", + "pellet_modded_printer": "0", + "preferred_orientation": "0", + "print_host": "openeye3dpi.local", + "printable_height": "250", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "printing_by_object_gcode": "", + "purge_in_prime_tower": "1", + "resonance_avoidance": "0", + "retract_before_wipe": [ + "0%" + ], + "retract_length_toolchange": [ + "0" + ], + "retract_lift_above": [ + "0" + ], + "retract_lift_below": [ + "180", + "180" + ], + "retract_lift_enforce": [ + "All Surfaces" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_distances_when_cut": [ + "18" + ], + "retraction_length": [ + "0.8" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "30" + ], + "scan_first_layer": "0", + "silent_mode": "0", + "single_extruder_multi_material": "1", + "support_air_filtration": "0", + "support_chamber_temp_control": "0", + "support_multi_bed_types": "1", + "template_custom_gcode": "", + "thumbnails": "48x48/PNG, 300x300/PNG", + "thumbnails_format": "PNG", + "time_cost": "0", + "time_lapse_gcode": "", + "travel_slope": [ + "3" + ], + "type": "machine", + "use_firmware_retraction": "0", + "use_relative_e_distances": "1", + "wipe": [ + "1" + ], + "wipe_distance": [ + "1" + ], + "z_hop": [ + "0.4" + ], + "z_hop_types": [ + "Auto Lift" + ], + "z_offset": "0" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/pei.png b/resources/profiles/OpenEYE/pei.png new file mode 100644 index 0000000000..30c64391b8 Binary files /dev/null and b/resources/profiles/OpenEYE/pei.png differ diff --git a/resources/profiles/OpenEYE/peo.png b/resources/profiles/OpenEYE/peo.png new file mode 100644 index 0000000000..b3d70117d7 Binary files /dev/null and b/resources/profiles/OpenEYE/peo.png differ diff --git a/resources/profiles/OpenEYE/pet.png b/resources/profiles/OpenEYE/pet.png new file mode 100644 index 0000000000..0679d1bf93 Binary files /dev/null and b/resources/profiles/OpenEYE/pet.png differ diff --git a/resources/profiles/OpenEYE/process/0.08mm Extra Fine @OpenEYE Peacock V2 0.2 nozzle.json b/resources/profiles/OpenEYE/process/0.08mm Extra Fine @OpenEYE Peacock V2 0.2 nozzle.json new file mode 100644 index 0000000000..b936ec8a5e --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.08mm Extra Fine @OpenEYE Peacock V2 0.2 nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "process", + "name": "0.08mm Extra Fine @OpenEYE Peacock V2 0.2 nozzle", + "inherits": "fdm_process_openeye_0.08_nozzle_0.2", + "from": "system", + "setting_id": "GP139", + "instantiation": "true", + "description": "High quality profile for 0.2mm nozzle, prioritizing print quality.", + "default_acceleration": "8000", + "initial_layer_speed": "40", + "overhang_1_4_speed": "60", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.08mm Extra Fine @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.08mm Extra Fine @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..a0a4d450db --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.08mm Extra Fine @OpenEYE Peacock V2.json @@ -0,0 +1,27 @@ +{ + "type": "process", + "name": "0.08mm Extra Fine @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.08_nozzle_0.4", + "from": "system", + "setting_id": "GP136", + "instantiation": "true", + "default_acceleration": "4000", + "gap_infill_speed": "50", + "initial_layer_infill_speed": "70", + "initial_layer_speed": "40", + "inner_wall_speed": "120", + "internal_solid_infill_speed": "120", + "outer_wall_acceleration": "2000", + "outer_wall_speed": "60", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "100", + "top_surface_speed": "120", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle.json b/resources/profiles/OpenEYE/process/0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle.json new file mode 100644 index 0000000000..3b7dad1b6d --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "name": "0.10mm Standard @OpenEYE Peacock V2 0.2 nozzle", + "inherits": "fdm_process_openeye_0.10_nozzle_0.2", + "from": "system", + "setting_id": "GP123", + "instantiation": "true", + "default_acceleration": "8000", + "initial_layer_speed": "40", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.12mm Balanced Quality @OpenEYE Peacock V2 0.2 nozzle.json b/resources/profiles/OpenEYE/process/0.12mm Balanced Quality @OpenEYE Peacock V2 0.2 nozzle.json new file mode 100644 index 0000000000..a0f9480ac6 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.12mm Balanced Quality @OpenEYE Peacock V2 0.2 nozzle.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "name": "0.12mm Balanced Quality @OpenEYE Peacock V2 0.2 nozzle", + "inherits": "fdm_process_openeye_0.12_nozzle_0.2", + "from": "system", + "setting_id": "GP140", + "instantiation": "true", + "default_acceleration": "8000", + "initial_layer_speed": "40", + "overhang_1_4_speed": "60", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.12mm Fine @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.12mm Fine @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..5977f3977d --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.12mm Fine @OpenEYE Peacock V2.json @@ -0,0 +1,31 @@ +{ + "type": "process", + "name": "0.12mm Fine @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.12_nozzle_0.4", + "from": "system", + "setting_id": "GP142", + "instantiation": "true", + "bottom_shell_layers": "7", + "default_acceleration": "4000", + "gap_infill_speed": "50", + "initial_layer_infill_speed": "70", + "initial_layer_speed": "40", + "inner_wall_speed": "120", + "internal_solid_infill_speed": "150", + "outer_wall_acceleration": "2000", + "outer_wall_speed": "60", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "100", + "top_color_penetration_layers": "7", + "top_shell_layers": "9", + "top_shell_thickness": "0.8", + "top_surface_speed": "150", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.16mm Balanced Quality @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.16mm Balanced Quality @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..9d3101e52d --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.16mm Balanced Quality @OpenEYE Peacock V2.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.16mm Balanced Quality @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.16_nozzle_0.4", + "from": "system", + "setting_id": "GP174", + "instantiation": "true", + "description": "High quality profile for 0.16mm layer height, prioritizing print quality and strength.", + "default_acceleration": "4000", + "initial_layer_speed": "50", + "inner_wall_speed": "150", + "internal_solid_infill_speed": "180", + "outer_wall_acceleration": "2000", + "outer_wall_speed": "60", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": "180", + "top_surface_speed": "150", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.16mm Standard @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.16mm Standard @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..66e8d419b0 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.16mm Standard @OpenEYE Peacock V2.json @@ -0,0 +1,21 @@ +{ + "type": "process", + "name": "0.16mm Standard @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.16_nozzle_0.4", + "from": "system", + "setting_id": "GP143", + "instantiation": "true", + "description": "Standard profile for 0.16mm layer height, prioritizing speed.", + "default_acceleration": "8000", + "initial_layer_speed": "50", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_1_4_speed": "60", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.18mm Balanced Quality @OpenEYE Peacock V2 0.6 nozzle.json b/resources/profiles/OpenEYE/process/0.18mm Balanced Quality @OpenEYE Peacock V2 0.6 nozzle.json new file mode 100644 index 0000000000..07e5caf0ad --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.18mm Balanced Quality @OpenEYE Peacock V2 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.18mm Balanced Quality @OpenEYE Peacock V2 0.6 nozzle", + "inherits": "fdm_process_openeye_0.18_nozzle_0.6", + "from": "system", + "setting_id": "GP137", + "instantiation": "true", + "description": "High quality profile for 0.6mm nozzle, prioritizing print quality and strength.", + "bridge_speed": "50", + "default_acceleration": "8000", + "gap_infill_speed": "250", + "initial_layer_infill_speed": "105", + "initial_layer_speed": "50", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_3_4_speed": "30", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "top_surface_speed": "200", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.20mm Balanced Strength @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.20mm Balanced Strength @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..997c79a2d1 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.20mm Balanced Strength @OpenEYE Peacock V2.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.20mm Balanced Strength @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.20_nozzle_0.4", + "from": "system", + "setting_id": "GP173", + "instantiation": "true", + "description": "High quality profile for 0.2mm layer height, prioritizing strength and print quality.", + "bottom_shell_layers": "4", + "default_acceleration": "4000", + "initial_layer_speed": "50", + "inner_wall_speed": "150", + "internal_solid_infill_speed": "200", + "outer_wall_acceleration": "2000", + "outer_wall_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "200", + "top_shell_layers": "6", + "top_surface_speed": "150", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.20mm Standard @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.20mm Standard @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..6cfd900f45 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.20mm Standard @OpenEYE Peacock V2.json @@ -0,0 +1,21 @@ +{ + "type": "process", + "name": "0.20mm Standard @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.20_nozzle_0.4", + "from": "system", + "setting_id": "GP124", + "instantiation": "true", + "description": "Standard profile for 0.4mm nozzle, prioritizing speed.", + "default_acceleration": "8000", + "initial_layer_speed": "50", + "internal_solid_infill_speed": "250", + "inner_wall_speed": "300", + "outer_wall_speed": "200", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.24mm Balanced Quality @OpenEYE Peacock V2 0.8 nozzle.json b/resources/profiles/OpenEYE/process/0.24mm Balanced Quality @OpenEYE Peacock V2 0.8 nozzle.json new file mode 100644 index 0000000000..1485ca9fe0 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.24mm Balanced Quality @OpenEYE Peacock V2 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "process", + "name": "0.24mm Balanced Quality @OpenEYE Peacock V2 0.8 nozzle", + "inherits": "fdm_process_openeye_0.24_nozzle_0.8", + "from": "system", + "setting_id": "GP138", + "instantiation": "true", + "description": "High quality profile for 0.8mm nozzle, prioritizing print quality.", + "bridge_speed": "50", + "default_acceleration": "8000", + "gap_infill_speed": "250", + "initial_layer_infill_speed": "105", + "initial_layer_speed": "50", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "top_surface_speed": "200", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.24mm Balanced Strength @OpenEYE Peacock V2 0.6 nozzle.json b/resources/profiles/OpenEYE/process/0.24mm Balanced Strength @OpenEYE Peacock V2 0.6 nozzle.json new file mode 100644 index 0000000000..316b2e7ae0 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.24mm Balanced Strength @OpenEYE Peacock V2 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.24mm Balanced Strength @OpenEYE Peacock V2 0.6 nozzle", + "inherits": "fdm_process_openeye_0.24_nozzle_0.6", + "from": "system", + "setting_id": "GP146", + "instantiation": "true", + "description": "Strength profile for 0.6mm nozzle, prioritizing strength.", + "bridge_speed": "50", + "default_acceleration": "8000", + "gap_infill_speed": "250", + "initial_layer_infill_speed": "105", + "initial_layer_speed": "50", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_3_4_speed": "30", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "top_surface_speed": "200", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.24mm Standard @OpenEYE Peacock V2.json b/resources/profiles/OpenEYE/process/0.24mm Standard @OpenEYE Peacock V2.json new file mode 100644 index 0000000000..71492028d9 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.24mm Standard @OpenEYE Peacock V2.json @@ -0,0 +1,19 @@ +{ + "type": "process", + "name": "0.24mm Standard @OpenEYE Peacock V2", + "inherits": "fdm_process_openeye_0.24_nozzle_0.4", + "from": "system", + "setting_id": "GP144", + "instantiation": "true", + "default_acceleration": "8000", + "initial_layer_speed": "50", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle.json b/resources/profiles/OpenEYE/process/0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle.json new file mode 100644 index 0000000000..4733f27324 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.30mm Standard @OpenEYE Peacock V2 0.6 nozzle", + "inherits": "fdm_process_openeye_0.30_nozzle_0.6", + "from": "system", + "setting_id": "GP125", + "instantiation": "true", + "description": "Standard profile for 0.6mm nozzle, prioritizing speed.", + "bridge_speed": "50", + "default_acceleration": "8000", + "gap_infill_speed": "250", + "initial_layer_infill_speed": "105", + "initial_layer_speed": "50", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_3_4_speed": "30", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "top_surface_speed": "200", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.32mm Balanced Strength @OpenEYE Peacock V2 0.8 nozzle.json b/resources/profiles/OpenEYE/process/0.32mm Balanced Strength @OpenEYE Peacock V2 0.8 nozzle.json new file mode 100644 index 0000000000..170c9e4e7f --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.32mm Balanced Strength @OpenEYE Peacock V2 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "process", + "name": "0.32mm Balanced Strength @OpenEYE Peacock V2 0.8 nozzle", + "inherits": "fdm_process_openeye_0.32_nozzle_0.8", + "from": "system", + "setting_id": "GP149", + "instantiation": "true", + "description": "Strength profile for 0.8mm nozzle, prioritizing strength.", + "bridge_speed": "50", + "default_acceleration": "8000", + "gap_infill_speed": "250", + "initial_layer_infill_speed": "105", + "initial_layer_speed": "50", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "top_surface_speed": "200", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle.json b/resources/profiles/OpenEYE/process/0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle.json new file mode 100644 index 0000000000..878383b1f6 --- /dev/null +++ b/resources/profiles/OpenEYE/process/0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "process", + "name": "0.40mm Standard @OpenEYE Peacock V2 0.8 nozzle", + "inherits": "fdm_process_openeye_0.40_nozzle_0.8", + "from": "system", + "setting_id": "GP126", + "instantiation": "true", + "description": "Standard profile for 0.8mm nozzle, prioritizing speed.", + "bridge_speed": "50", + "default_acceleration": "8000", + "gap_infill_speed": "250", + "initial_layer_infill_speed": "105", + "initial_layer_speed": "50", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "outer_wall_speed": "200", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "prime_tower_brim_width": "3", + "prime_tower_width": "60", + "sparse_infill_speed": "350", + "top_surface_speed": "200", + "travel_speed": "500", + "compatible_printers": [ + "OpenEYE Peacock V2 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_common.json b/resources/profiles/OpenEYE/process/fdm_process_common.json new file mode 100644 index 0000000000..40987d67ab --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_common.json @@ -0,0 +1,116 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "adaptive_layer_height": "0", + "bottom_shell_layers": "3", + "bottom_shell_thickness": "0", + "bottom_surface_pattern": "monotonic", + "bridge_flow": "0.95", + "bridge_no_support": "0", + "bridge_speed": "25", + "brim_object_gap": "0.1", + "brim_width": "5", + "compatible_printers_condition": "", + "default_acceleration": "10000", + "detect_overhang_wall": "1", + "detect_thin_wall": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0.15", + "elefant_foot_compensation_layers": "1", + "enable_arc_fitting": "1", + "enable_prime_tower": "1", + "enable_support": "0", + "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", + "gap_infill_speed": "30", + "infill_combination": "0", + "infill_direction": "45", + "infill_wall_overlap": "15%", + "initial_layer_line_width": "0.5", + "initial_layer_print_height": "0.2", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.45", + "inner_wall_speed": "40", + "interface_shells": "0", + "internal_bridge_support_thickness": "0.8", + "internal_solid_infill_line_width": "0.42", + "internal_solid_infill_speed": "40", + "ironing_flow": "10%", + "ironing_inset": "0.21", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "layer_height": "0.2", + "line_width": "0.42", + "max_bridge_length": "0", + "max_travel_detour_distance": "0", + "minimum_sparse_infill_area": "15", + "only_one_wall_top": "1", + "outer_wall_line_width": "0.42", + "outer_wall_speed": "120", + "prime_tower_width": "35", + "print_sequence": "by layer", + "print_settings_id": "", + "prime_tower_brim_width": "3", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "scarf_angle_threshold": "155", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "0", + "sparse_infill_density": "15%", + "skeleton_infill_density": "15%", + "skin_infill_density": "15%", + "sparse_infill_line_width": "0.45", + "skin_infill_line_width": "0.45", + "skin_infill_depth": "2.0", + "skeleton_infill_line_width": "0.45", + "sparse_infill_pattern": "grid", + "sparse_infill_speed": "50", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_bottom_z_distance": "0.2", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "2", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_pattern": "auto", + "support_interface_spacing": "0.5", + "support_interface_speed": "80", + "support_interface_top_layers": "2", + "support_line_width": "0.42", + "support_object_xy_distance": "0.35", + "support_on_build_plate_only": "0", + "support_speed": "40", + "support_style": "default", + "support_threshold_angle": "30", + "support_top_z_distance": "0.2", + "support_type": "tree(auto)", + "seam_slope_type": "none", + "seam_slope_start_height": "10%", + "seam_slope_min_length": "10", + "symmetric_infill_y_axis": "0", + "top_shell_layers": "3", + "top_shell_thickness": "0.8", + "top_surface_line_width": "0.42", + "top_surface_pattern": "monotonicline", + "top_surface_speed": "30", + "travel_acceleration": "10000", + "travel_speed": "400", + "tree_support_branch_angle": "45", + "tree_support_branch_diameter": "2", + "tree_support_wall_count": "0", + "wall_generator": "classic", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "2", + "wipe_tower_no_sparse_layers": "0", + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.06_nozzle_0.2.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.06_nozzle_0.2.json new file mode 100644 index 0000000000..6354d949fd --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.06_nozzle_0.2.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.06_nozzle_0.2", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "5", + "bottom_color_penetration_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.25", + "initial_layer_print_height": "0.1", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.22", + "internal_solid_infill_line_width": "0.22", + "ironing_inset": "0.11", + "initial_layer_infill_speed": "70", + "layer_height": "0.06", + "line_width": "0.22", + "outer_wall_line_width": "0.22", + "sparse_infill_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.06", + "support_line_width": "0.22", + "support_top_z_distance": "0.06", + "top_shell_layers": "7", + "top_color_penetration_layers": "7", + "top_surface_line_width": "0.22", + "top_surface_speed": "150", + "wall_loops": "4" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.08_nozzle_0.2.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.08_nozzle_0.2.json new file mode 100644 index 0000000000..309d338619 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.08_nozzle_0.2.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.08_nozzle_0.2", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "5", + "bottom_color_penetration_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.25", + "initial_layer_print_height": "0.1", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.22", + "internal_solid_infill_line_width": "0.22", + "ironing_inset": "0.11", + "initial_layer_infill_speed": "70", + "layer_height": "0.08", + "line_width": "0.22", + "outer_wall_line_width": "0.22", + "sparse_infill_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.08", + "support_line_width": "0.22", + "support_top_z_distance": "0.08", + "top_shell_layers": "7", + "top_color_penetration_layers": "7", + "top_surface_line_width": "0.22", + "top_surface_speed": "150", + "wall_loops": "4" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.08_nozzle_0.4.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.08_nozzle_0.4.json new file mode 100644 index 0000000000..25f9cc89a5 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.08_nozzle_0.4.json @@ -0,0 +1,25 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.08_nozzle_0.4", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "7", + "bottom_color_penetration_layers": "7", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": "250", + "initial_layer_speed":"20", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "ironing_flow": "8%", + "initial_layer_infill_speed": "105", + "layer_height": "0.08", + "sparse_infill_speed": "270", + "support_bottom_z_distance": "0.08", + "support_threshold_angle": "15", + "support_top_z_distance": "0.08", + "top_shell_layers": "9", + "top_color_penetration_layers": "9", + "top_shell_thickness": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.10_nozzle_0.2.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.10_nozzle_0.2.json new file mode 100644 index 0000000000..983138a494 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.10_nozzle_0.2.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.10_nozzle_0.2", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "5", + "bottom_color_penetration_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.25", + "initial_layer_print_height": "0.1", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.22", + "internal_solid_infill_line_width": "0.22", + "ironing_inset": "0.11", + "initial_layer_infill_speed": "70", + "layer_height": "0.1", + "line_width": "0.22", + "outer_wall_line_width": "0.22", + "sparse_infill_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.1", + "support_line_width": "0.22", + "support_top_z_distance": "0.1", + "top_shell_layers": "7", + "top_color_penetration_layers": "7", + "top_surface_line_width": "0.22", + "top_surface_speed": "150", + "wall_loops": "4" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.12_nozzle_0.2.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.12_nozzle_0.2.json new file mode 100644 index 0000000000..67146aef2c --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.12_nozzle_0.2.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.12_nozzle_0.2", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "5", + "bottom_color_penetration_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.25", + "initial_layer_print_height": "0.1", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.22", + "internal_solid_infill_line_width": "0.22", + "ironing_inset": "0.11", + "initial_layer_infill_speed": "70", + "layer_height": "0.12", + "line_width": "0.22", + "outer_wall_line_width": "0.22", + "sparse_infill_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.12", + "support_line_width": "0.22", + "support_top_z_distance": "0.12", + "top_shell_layers": "7", + "top_color_penetration_layers": "7", + "top_surface_line_width": "0.22", + "top_surface_speed": "150", + "wall_loops": "4" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.12_nozzle_0.4.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.12_nozzle_0.4.json new file mode 100644 index 0000000000..a08f0fc9ff --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.12_nozzle_0.4.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.12_nozzle_0.4", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "5", + "bottom_color_penetration_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": "250", + "initial_layer_speed": "20", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "initial_layer_infill_speed": "105", + "layer_height": "0.12", + "sparse_infill_speed": "270", + "support_bottom_z_distance": "0.12", + "support_threshold_angle": "20", + "support_top_z_distance": "0.12", + "top_shell_layers": "5", + "top_color_penetration_layers": "5", + "top_shell_thickness": "0.6" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.14_nozzle_0.2.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.14_nozzle_0.2.json new file mode 100644 index 0000000000..f5ced921a7 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.14_nozzle_0.2.json @@ -0,0 +1,33 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.14_nozzle_0.2", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "5", + "bottom_color_penetration_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.25", + "initial_layer_print_height": "0.1", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.22", + "internal_solid_infill_line_width": "0.22", + "ironing_inset": "0.11", + "initial_layer_infill_speed": "70", + "layer_height": "0.14", + "line_width": "0.22", + "outer_wall_line_width": "0.22", + "sparse_infill_line_width": "0.22", + "skin_infill_line_width": "0.22", + "skeleton_infill_line_width": "0.22", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.14", + "support_line_width": "0.22", + "support_top_z_distance": "0.14", + "top_shell_layers": "7", + "top_color_penetration_layers": "7", + "top_surface_line_width": "0.22", + "top_surface_speed": "150", + "wall_loops": "4" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.16_nozzle_0.4.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.16_nozzle_0.4.json new file mode 100644 index 0000000000..8a106a5385 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.16_nozzle_0.4.json @@ -0,0 +1,24 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.16_nozzle_0.4", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bottom_shell_layers": "4", + "bottom_color_penetration_layers": "4", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": "250", + "initial_layer_speed": "20", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "initial_layer_infill_speed": "105", + "layer_height": "0.16", + "sparse_infill_speed": "270", + "support_bottom_z_distance": "0.16", + "support_threshold_angle": "25", + "support_top_z_distance": "0.16", + "top_shell_layers": "6", + "top_color_penetration_layers": "6", + "top_shell_thickness": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.18_nozzle_0.6.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.18_nozzle_0.6.json new file mode 100644 index 0000000000..8b6629efba --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.18_nozzle_0.6.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.18_nozzle_0.6", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.62", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_infill_speed": "55", + "layer_height": "0.18", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "overhang_3_4_speed": "15", + "sparse_infill_line_width": "0.62", + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.18", + "support_line_width": "0.62", + "support_top_z_distance": "0.18", + "top_surface_line_width": "0.62", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.20_nozzle_0.4.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.20_nozzle_0.4.json new file mode 100644 index 0000000000..6689407a67 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.20_nozzle_0.4.json @@ -0,0 +1,18 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.20_nozzle_0.4", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": "250", + "initial_layer_speed": "20", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "initial_layer_infill_speed": "105", + "sparse_infill_speed": "270", + "top_shell_layers": "5", + "top_color_penetration_layers": "5", + "top_shell_thickness": "1.0" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.4.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.4.json new file mode 100644 index 0000000000..552092e6d9 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.4.json @@ -0,0 +1,21 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.24_nozzle_0.4", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": "250", + "initial_layer_speed": "20", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "initial_layer_infill_speed": "105", + "layer_height": "0.24", + "sparse_infill_speed": "270", + "support_threshold_angle": "35", + "top_shell_layers": "4", + "top_color_penetration_layers": "4", + "top_shell_thickness": "1.0", + "top_surface_line_width": "0.45" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.6.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.6.json new file mode 100644 index 0000000000..7f0e3b3e88 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.6.json @@ -0,0 +1,28 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.24_nozzle_0.6", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.62", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_infill_speed": "55", + "layer_height": "0.24", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "overhang_3_4_speed": "15", + "sparse_infill_line_width": "0.62", + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", + "sparse_infill_speed": "100", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.8.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.8.json new file mode 100644 index 0000000000..34e37cea92 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.24_nozzle_0.8.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.24_nozzle_0.8", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.82", + "initial_layer_print_height": "0.4", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.82", + "internal_solid_infill_line_width": "0.82", + "ironing_inset": "0.41", + "initial_layer_infill_speed": "55", + "layer_height": "0.24", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "5", + "sparse_infill_line_width": "0.82", + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", + "sparse_infill_speed": "100", + "support_line_width": "0.82", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.28_nozzle_0.4.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.28_nozzle_0.4.json new file mode 100644 index 0000000000..d1a15baea5 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.28_nozzle_0.4.json @@ -0,0 +1,21 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.28_nozzle_0.4", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": "250", + "initial_layer_speed": "20", + "inner_wall_speed": "300", + "internal_solid_infill_speed": "250", + "initial_layer_infill_speed": "105", + "layer_height": "0.28", + "sparse_infill_speed": "270", + "support_threshold_angle": "40", + "top_shell_layers": "4", + "top_color_penetration_layers": "4", + "top_shell_thickness": "1.0", + "top_surface_line_width": "0.45" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.30_nozzle_0.6.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.30_nozzle_0.6.json new file mode 100644 index 0000000000..b1106a1682 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.30_nozzle_0.6.json @@ -0,0 +1,28 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.30_nozzle_0.6", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.62", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_infill_speed": "55", + "layer_height": "0.3", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "overhang_3_4_speed": "15", + "sparse_infill_line_width": "0.62", + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", + "sparse_infill_speed": "100", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.32_nozzle_0.8.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.32_nozzle_0.8.json new file mode 100644 index 0000000000..f0f9f2da9d --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.32_nozzle_0.8.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.32_nozzle_0.8", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.82", + "initial_layer_print_height": "0.4", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.82", + "internal_solid_infill_line_width": "0.82", + "ironing_inset": "0.41", + "initial_layer_infill_speed": "55", + "layer_height": "0.32", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "5", + "sparse_infill_line_width": "0.82", + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", + "sparse_infill_speed": "100", + "support_line_width": "0.82", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.36_nozzle_0.6.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.36_nozzle_0.6.json new file mode 100644 index 0000000000..b625904c7b --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.36_nozzle_0.6.json @@ -0,0 +1,28 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.36_nozzle_0.6", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.62", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_infill_speed": "55", + "layer_height": "0.36", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "overhang_3_4_speed": "15", + "sparse_infill_line_width": "0.62", + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", + "sparse_infill_speed": "100", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.40_nozzle_0.8.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.40_nozzle_0.8.json new file mode 100644 index 0000000000..304d66c8de --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.40_nozzle_0.8.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.40_nozzle_0.8", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.82", + "initial_layer_print_height": "0.4", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.82", + "internal_solid_infill_line_width": "0.82", + "ironing_inset": "0.41", + "initial_layer_infill_speed": "55", + "layer_height": "0.4", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "5", + "sparse_infill_line_width": "0.82", + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", + "sparse_infill_speed": "100", + "support_line_width": "0.82", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.42_nozzle_0.6.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.42_nozzle_0.6.json new file mode 100644 index 0000000000..e2fd061207 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.42_nozzle_0.6.json @@ -0,0 +1,28 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.42_nozzle_0.6", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.62", + "initial_layer_print_height": "0.3", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "ironing_inset": "0.31", + "initial_layer_infill_speed": "55", + "layer_height": "0.42", + "line_width": "0.62", + "outer_wall_line_width": "0.62", + "overhang_3_4_speed": "15", + "sparse_infill_line_width": "0.62", + "skin_infill_line_width": "0.62", + "skeleton_infill_line_width": "0.62", + "sparse_infill_speed": "100", + "support_line_width": "0.62", + "top_surface_line_width": "0.62", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.48_nozzle_0.8.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.48_nozzle_0.8.json new file mode 100644 index 0000000000..12a5931ee2 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.48_nozzle_0.8.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.48_nozzle_0.8", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.82", + "initial_layer_print_height": "0.4", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.82", + "internal_solid_infill_line_width": "0.82", + "ironing_inset": "0.41", + "initial_layer_infill_speed": "55", + "layer_height": "0.48", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "5", + "sparse_infill_line_width": "0.82", + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", + "sparse_infill_speed": "100", + "support_line_width": "0.82", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_0.56_nozzle_0.8.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.56_nozzle_0.8.json new file mode 100644 index 0000000000..6522f6b686 --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_0.56_nozzle_0.8.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_openeye_0.56_nozzle_0.8", + "inherits": "fdm_process_openeye_common", + "from": "system", + "instantiation": "false", + "bridge_flow": "1", + "bridge_speed": "30", + "elefant_foot_compensation": "0.15", + "initial_layer_line_width": "0.82", + "initial_layer_print_height": "0.4", + "initial_layer_speed": "20", + "inner_wall_line_width": "0.82", + "internal_solid_infill_line_width": "0.82", + "ironing_inset": "0.41", + "initial_layer_infill_speed": "55", + "layer_height": "0.56", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "5", + "sparse_infill_line_width": "0.82", + "skin_infill_line_width": "0.82", + "skeleton_infill_line_width": "0.82", + "sparse_infill_speed": "100", + "support_line_width": "0.82", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": "150" +} \ No newline at end of file diff --git a/resources/profiles/OpenEYE/process/fdm_process_openeye_common.json b/resources/profiles/OpenEYE/process/fdm_process_openeye_common.json new file mode 100644 index 0000000000..c83936321b --- /dev/null +++ b/resources/profiles/OpenEYE/process/fdm_process_openeye_common.json @@ -0,0 +1,54 @@ +{ + "type": "process", + "name": "fdm_process_openeye_common", + "inherits": "fdm_process_common", + "from": "system", + "instantiation": "false", + "align_infill_direction_to_model": "1", + "exclude_object": "1", + "bridge_speed": "50", + "default_acceleration": "10000", + "enable_overhang_speed": "1", + "gap_infill_speed": "50", + "initial_layer_acceleration": "500", + "initial_layer_infill_speed": "60", + "initial_layer_speed": "30", + "inner_wall_acceleration": "0", + "inner_wall_speed": "150", + "internal_solid_infill_speed": "150", + "outer_wall_acceleration": "5000", + "outer_wall_speed": "120", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "reduce_crossing_wall": "1", + "role_based_wipe_speed": "1", + "scarf_angle_threshold": "155", + "scarf_joint_flow_ratio": "1", + "scarf_joint_speed": "100%", + "scarf_overhang_threshold": "40%", + "seam_gap": "10%", + "seam_position": "aligned_back", + "seam_slope_conditional": "1", + "seam_slope_entire_loop": "0", + "seam_slope_inner_walls": "1", + "seam_slope_min_length": "20", + "seam_slope_start_height": "0", + "seam_slope_steps": "10", + "seam_slope_type": "none", + "small_perimeter_speed": "50%", + "small_perimeter_threshold": "0", + "sparse_infill_acceleration": "100%", + "sparse_infill_speed": "250", + "support_interface_speed": "80", + "support_speed": "150", + "support_on_build_plate_only": "1", + "travel_acceleration": "10000", + "top_surface_acceleration": "2000", + "top_surface_speed": "200", + "travel_speed": "500", + "travel_speed_z": "0", + "wipe_tower_wall_type": "rib", + "wipe_tower_rib_width": "8" +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index ca80b86d12..1f4b2cf779 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -1212,9 +1212,80 @@ "name": "COEX PLA+Silk @System", "sub_path": "filament/COEX/COEX PLA+Silk @System.json" }, - { - "name": "Numakers PLA+ @System", + { "name": "Numakers PLA+ @System", "sub_path": "filament/Numakers/Numakers PLA+ @System.json" + }, + { + "name": "Eolas Prints PLA Premium @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Premium @System.json" + }, + { + "name": "Eolas Prints PLA Matte @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Matte @System.json" + }, + { + "name": "Eolas Prints PLA Silk @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Silk @System.json" + }, + { + "name": "Eolas Prints PLA Neon @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Neon @System.json" + }, + { + "name": "Eolas Prints PLA High Speed @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA High Speed @System.json" + }, + { + "name": "Eolas Prints PLA INGEO 850 @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json" + }, + { + "name": "Eolas Prints PLA INGEO 870 @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json" + }, + { + "name": "Eolas Prints PLA Antibacterial @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json" + }, + { + "name": "Eolas Prints PLA Transition @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PLA Transition @System.json" + }, + { + "name": "Eolas Prints PETG @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PETG @System.json" + }, + { + "name": "Eolas Prints PETG UV Resistant @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json" + }, + { + "name": "Eolas Prints PETG Transition @System", + "sub_path": "filament/Eolas Prints/Eolas Prints PETG Transition @System.json" + }, + { + "name": "Eolas Prints TPU Flex 93A @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json" + }, + { + "name": "Eolas Prints TPU Flex D53 @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json" + }, + { + "name": "Eolas Prints TPU Flex D60 UV Resistant @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json" + }, + { + "name": "Eolas Prints TPU Transition @System", + "sub_path": "filament/Eolas Prints/Eolas Prints TPU Transition @System.json" + }, + { + "name": "Eolas Prints ABS @System", + "sub_path": "filament/Eolas Prints/Eolas Prints ABS @System.json" + }, + { + "name": "Eolas Prints ASA @System", + "sub_path": "filament/Eolas Prints/Eolas Prints ASA @System.json" } ], "process_list": [], diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json new file mode 100644 index 0000000000..bf8afa8b31 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ABS @System.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "filament_id": "GFSEP017", + "setting_id": "GFSEP017_00", + "name": "Eolas Prints ABS @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["ABS"], + "nozzle_temperature": ["255"], + "nozzle_temperature_initial_layer": ["260"], + "nozzle_temperature_range_low": ["240"], + "nozzle_temperature_range_high": ["270"], + "hot_plate_temp": ["100"], + "hot_plate_temp_initial_layer": ["105"], + "chamber_temperature": ["40"], + "filament_density": ["1.04"], + "filament_cost": ["19.50"], + "filament_spool_weight": ["900"], + "filament_max_volumetric_speed": ["18"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json new file mode 100644 index 0000000000..21d7ef887b --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints ASA @System.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "filament_id": "GFSEP018", + "setting_id": "GFSEP018_00", + "name": "Eolas Prints ASA @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_asa", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["ASA"], + "nozzle_temperature": ["260"], + "nozzle_temperature_initial_layer": ["270"], + "nozzle_temperature_range_low": ["245"], + "nozzle_temperature_range_high": ["275"], + "hot_plate_temp": ["100"], + "hot_plate_temp_initial_layer": ["105"], + "chamber_temperature": ["40"], + "filament_density": ["1.07"], + "filament_cost": ["22.50"], + "filament_spool_weight": ["900"], + "filament_max_volumetric_speed": ["18"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json new file mode 100644 index 0000000000..6f02d13138 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP010", + "setting_id": "GFSEP010_00", + "name": "Eolas Prints PETG @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PETG"], + "nozzle_temperature": ["240"], + "nozzle_temperature_initial_layer": ["245"], + "nozzle_temperature_range_low": ["230"], + "nozzle_temperature_range_high": ["260"], + "hot_plate_temp": ["80"], + "hot_plate_temp_initial_layer": ["85"], + "filament_density": ["1.27"], + "filament_cost": ["25.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json new file mode 100644 index 0000000000..d9e125b8ff --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG Transition @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP012", + "setting_id": "GFSEP012_00", + "name": "Eolas Prints PETG Transition @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PETG"], + "nozzle_temperature": ["240"], + "nozzle_temperature_initial_layer": ["245"], + "nozzle_temperature_range_low": ["230"], + "nozzle_temperature_range_high": ["260"], + "hot_plate_temp": ["80"], + "hot_plate_temp_initial_layer": ["85"], + "filament_density": ["1.27"], + "filament_cost": ["17.40"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json new file mode 100644 index 0000000000..8810346918 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PETG UV Resistant @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP011", + "setting_id": "GFSEP011_00", + "name": "Eolas Prints PETG UV Resistant @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PETG"], + "nozzle_temperature": ["245"], + "nozzle_temperature_initial_layer": ["250"], + "nozzle_temperature_range_low": ["235"], + "nozzle_temperature_range_high": ["265"], + "hot_plate_temp": ["80"], + "hot_plate_temp_initial_layer": ["85"], + "filament_density": ["1.27"], + "filament_cost": ["30.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json new file mode 100644 index 0000000000..b41e563301 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Antibacterial @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP008", + "setting_id": "GFSEP008_00", + "name": "Eolas Prints PLA Antibacterial @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["216"], + "nozzle_temperature_initial_layer": ["220"], + "nozzle_temperature_range_low": ["195"], + "nozzle_temperature_range_high": ["230"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["30.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json new file mode 100644 index 0000000000..fd41493192 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA High Speed @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP005", + "setting_id": "GFSEP005_00", + "name": "Eolas Prints PLA High Speed @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["220"], + "nozzle_temperature_initial_layer": ["220"], + "nozzle_temperature_range_low": ["210"], + "nozzle_temperature_range_high": ["240"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["25.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["17.8"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json new file mode 100644 index 0000000000..ccef240d17 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 850 @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP006", + "setting_id": "GFSEP006_00", + "name": "Eolas Prints PLA INGEO 850 @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["210"], + "nozzle_temperature_initial_layer": ["215"], + "nozzle_temperature_range_low": ["190"], + "nozzle_temperature_range_high": ["230"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["25.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json new file mode 100644 index 0000000000..da7ebe735d --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA INGEO 870 @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP007", + "setting_id": "GFSEP007_00", + "name": "Eolas Prints PLA INGEO 870 @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["220"], + "nozzle_temperature_initial_layer": ["225"], + "nozzle_temperature_range_low": ["200"], + "nozzle_temperature_range_high": ["235"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.22"], + "filament_cost": ["30.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json new file mode 100644 index 0000000000..5c90dff774 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Matte @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP002", + "setting_id": "GFSEP002_00", + "name": "Eolas Prints PLA Matte @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["215"], + "nozzle_temperature_initial_layer": ["220"], + "nozzle_temperature_range_low": ["200"], + "nozzle_temperature_range_high": ["230"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["25.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json new file mode 100644 index 0000000000..857924f75a --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Neon @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP004", + "setting_id": "GFSEP004_00", + "name": "Eolas Prints PLA Neon @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["210"], + "nozzle_temperature_initial_layer": ["215"], + "nozzle_temperature_range_low": ["200"], + "nozzle_temperature_range_high": ["230"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["25.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["10"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json new file mode 100644 index 0000000000..ceeaabbcf5 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Premium @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP001", + "setting_id": "GFSEP001_00", + "name": "Eolas Prints PLA Premium @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["210"], + "nozzle_temperature_initial_layer": ["215"], + "nozzle_temperature_range_low": ["190"], + "nozzle_temperature_range_high": ["230"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["19.90"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json new file mode 100644 index 0000000000..0409a36e12 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Silk @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP003", + "setting_id": "GFSEP003_00", + "name": "Eolas Prints PLA Silk @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["215"], + "nozzle_temperature_initial_layer": ["220"], + "nozzle_temperature_range_low": ["205"], + "nozzle_temperature_range_high": ["235"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["25.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["8"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json new file mode 100644 index 0000000000..0804a78a64 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints PLA Transition @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP009", + "setting_id": "GFSEP009_00", + "name": "Eolas Prints PLA Transition @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["PLA"], + "nozzle_temperature": ["210"], + "nozzle_temperature_initial_layer": ["215"], + "nozzle_temperature_range_low": ["200"], + "nozzle_temperature_range_high": ["230"], + "hot_plate_temp": ["60"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.24"], + "filament_cost": ["13.90"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["15"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json new file mode 100644 index 0000000000..90cc77ff33 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex 93A @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP013", + "setting_id": "GFSEP013_00", + "name": "Eolas Prints TPU Flex 93A @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["TPU"], + "nozzle_temperature": ["220"], + "nozzle_temperature_initial_layer": ["225"], + "nozzle_temperature_range_low": ["210"], + "nozzle_temperature_range_high": ["240"], + "hot_plate_temp": ["50"], + "hot_plate_temp_initial_layer": ["55"], + "filament_density": ["1.21"], + "filament_cost": ["34.99"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["6"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json new file mode 100644 index 0000000000..96237eb712 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D53 @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP014", + "setting_id": "GFSEP014_00", + "name": "Eolas Prints TPU Flex D53 @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["TPU"], + "nozzle_temperature": ["220"], + "nozzle_temperature_initial_layer": ["225"], + "nozzle_temperature_range_low": ["205"], + "nozzle_temperature_range_high": ["235"], + "hot_plate_temp": ["45"], + "hot_plate_temp_initial_layer": ["50"], + "filament_density": ["1.17"], + "filament_cost": ["38.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["8"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json new file mode 100644 index 0000000000..e88f950722 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Flex D60 UV Resistant @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP015", + "setting_id": "GFSEP015_00", + "name": "Eolas Prints TPU D60 UV Resistant @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["TPU"], + "nozzle_temperature": ["225"], + "nozzle_temperature_initial_layer": ["230"], + "nozzle_temperature_range_low": ["215"], + "nozzle_temperature_range_high": ["245"], + "hot_plate_temp": ["55"], + "hot_plate_temp_initial_layer": ["60"], + "filament_density": ["1.16"], + "filament_cost": ["37.90"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["8"] +} \ No newline at end of file diff --git a/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json new file mode 100644 index 0000000000..c1029399d4 --- /dev/null +++ b/resources/profiles/OrcaFilamentLibrary/filament/Eolas Prints/Eolas Prints TPU Transition @System.json @@ -0,0 +1,22 @@ +{ + "type": "filament", + "filament_id": "GFSEP016", + "setting_id": "GFSEP016_00", + "name": "Eolas Prints TPU Transition @System", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_color": ["#4d9398"], + "filament_vendor": ["Eolas Prints"], + "filament_type": ["TPU"], + "nozzle_temperature": ["220"], + "nozzle_temperature_initial_layer": ["225"], + "nozzle_temperature_range_low": ["210"], + "nozzle_temperature_range_high": ["240"], + "hot_plate_temp": ["50"], + "hot_plate_temp_initial_layer": ["55"], + "filament_density": ["1.21"], + "filament_cost": ["22.50"], + "filament_spool_weight": ["1000"], + "filament_max_volumetric_speed": ["5"] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json index 6f7bd1649a..b63413d8ce 100644 --- a/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MINIIS 0.4 nozzle.json @@ -94,6 +94,9 @@ ], "z_hop": [ "0.2" + ], + "machine_max_junction_deviation": [ + "0.01" ], "fan_speedup_time": "0.2", "fan_speedup_overhangs": "1", @@ -102,7 +105,7 @@ "printable_height": "180", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X170 Y170 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+50, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM572 S0 ; reset PA\nM569 S1 X Y ; reset to stealthchop for X Y\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", "machine_pause_gcode": "M601", - "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.0.3+14902\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nG28 ; home all without mesh bed level\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow", + "machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.4.0+11974\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nG28 ; home all without mesh bed level\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))} Y{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))}", "change_filament_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n", diff --git a/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json index 8d5307d1a8..18576df366 100644 --- a/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa MK3.5 0.4 nozzle.json @@ -95,6 +95,9 @@ "z_hop": [ "0.2" ], + "machine_max_junction_deviation": [ + "0.01" + ], "fan_speedup_time": "0.2", "fan_speedup_overhangs": "1", "fan_kickstart": "0", @@ -102,7 +105,7 @@ "printable_height": "210", "machine_end_gcode": "{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+1, max_print_height)} F720 ; Move print head up{endif}\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X241 Y201 F3600 ; park\n{if layer_z < max_print_height}G1 Z{z_offset+min(layer_z+23, max_print_height)} F300 ; Move print head up{endif}\nG4 ; wait\nM572 S0 ; reset PA\nM593 X T2 F0 ; disable IS\nM593 Y T2 F0 ; disable IS\nM84 X Y E ; disable motors\n; max_layer_z = [max_layer_z]", "machine_pause_gcode": "M601", - "machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.3 P \"MK3.5\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.2.2+8853\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nG28 ; home all\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S170 ; set extruder temp for bed leveling\nM109 T0 R170 ; wait for temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X23 Y5 W80 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\n; Extrude purge line\n\nG92 E0 ; reset extruder position\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X{45 + 3} Z0.05 F8000 ; wipe, move close to the bed\nG0 X{45 + 3 * 2} Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; reset flow to 100%\n", + "machine_start_gcode": "M17 ; enable steppers\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.3 P \"MK3.5\" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U6.4.0+11974\n\nM555 X{(min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)} Y{(max(0, first_layer_print_min[1]) - 4)} W{((min(print_bed_max[0], max(first_layer_print_min[0] + 32, first_layer_print_max[0])))) - ((min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))} H{((first_layer_print_max[1])) - ((max(0, first_layer_print_min[1]) - 4))}\n\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n\nG28 ; home all\n\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S170 ; set extruder temp for bed leveling\nM109 T0 R170 ; wait for temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\n\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X23 Y5 W80 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\n\n; prepare for purge\nM104 S{first_layer_temperature[0]}\nG0 X0 Y-4 Z15 F4800 ; move away and ready for the purge\nM109 S{first_layer_temperature[0]}\n\n; Extrude purge line\n\nG92 E0 ; reset extruder position\nG0 E7 X15 Z0.2 F500 ; purge\nG0 X25 E4 F500 ; purge\nG0 X35 E4 F650 ; purge\nG0 X45 E4 F800 ; purge\nG0 X{45 + 3} Z0.05 F8000 ; wipe, move close to the bed\nG0 X{45 + 3 * 2} Z0.2 F8000 ; wipe, move quickly away from the bed\n\nG92 E0\nM221 S100 ; reset flow to 100%\n", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1400,2500), (10000,2500))} Y{interpolate_table(extruded_weight_total, (0,4000), (1400,2500), (10000,2500))}\n", "change_filament_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n", diff --git a/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json index 90282356ee..5a5e94e124 100644 --- a/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json +++ b/resources/profiles/Prusa/process/0.05mm DETAIL @CORE One 0.25.json @@ -10,5 +10,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "45", "initial_layer_speed": "25", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25", + "gap_infill_speed": "45", + "small_perimeter_speed": "45", + "outer_wall_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json b/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json index 9f2b524b57..6298c71d49 100644 --- a/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json +++ b/resources/profiles/Prusa/process/0.05mm Detail @MINIIS.json @@ -19,6 +19,9 @@ "top_shell_layers": "13", "bottom_shell_thickness": "0.5", "bottom_shell_layers": "10", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MINIIS 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json b/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json index 9f82ceb6eb..a9a79b47a1 100644 --- a/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json +++ b/resources/profiles/Prusa/process/0.05mm Detail @MK3.5.json @@ -19,7 +19,9 @@ "top_shell_layers": "13", "bottom_shell_thickness": "0.5", "bottom_shell_layers": "10", + "support_base_pattern_spacing": "1", "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MK3.5 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json index aa1fb6b9f7..cda4e3096b 100644 --- a/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json +++ b/resources/profiles/Prusa/process/0.07mm DETAIL @CORE One 0.25.json @@ -10,5 +10,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "45", "initial_layer_speed": "25", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25", + "gap_infill_speed": "45", + "small_perimeter_speed": "45", + "outer_wall_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json b/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json index 9217fc2f00..63d1757fd0 100644 --- a/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json +++ b/resources/profiles/Prusa/process/0.07mm Detail @MINIIS.json @@ -21,7 +21,9 @@ "bottom_shell_layers": "8", "bridge_speed": "30", "internal_solid_infill_speed": "140", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MINIIS 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json b/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json index 6fc9c6886c..eb90dc1922 100644 --- a/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json +++ b/resources/profiles/Prusa/process/0.07mm Detail @MK3.5.json @@ -21,7 +21,9 @@ "bottom_shell_layers": "8", "bridge_speed": "30", "internal_solid_infill_speed": "140", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MK3.5 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json index d481f3139d..b2c2ca9528 100644 --- a/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.10mm FAST DETAIL @CORE One 0.4.json @@ -13,5 +13,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "100", "initial_layer_speed": "45", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4", + "small_perimeter_speed": "145", + "inner_wall_speed": "145", + "outer_wall_speed": "145" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json index f5f6a460b0..df335dbe67 100644 --- a/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json +++ b/resources/profiles/Prusa/process/0.10mm STRUCTURAL @CORE One 0.5.json @@ -4,9 +4,9 @@ "inherits": "0.10mm STRUCTURAL @MK4S 0.5", "from": "system", "instantiation": "true", - "inner_wall_speed": "80", - "small_perimeter_speed": "45", - "outer_wall_speed": "45", + "inner_wall_speed": "70", + "small_perimeter_speed": "50", + "outer_wall_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json index b8107625fa..6a87714bb0 100644 --- a/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json +++ b/resources/profiles/Prusa/process/0.10mm Speed @MINIIS.json @@ -24,7 +24,9 @@ "internal_solid_infill_acceleration": "3000", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MINIIS 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json index 92d201b8e1..7327e51e82 100644 --- a/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json +++ b/resources/profiles/Prusa/process/0.10mm Speed @MK3.5.json @@ -24,7 +24,9 @@ "internal_solid_infill_acceleration": "3000", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MK3.5 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json b/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json index 69ef541dae..3fc92e8b42 100644 --- a/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json +++ b/resources/profiles/Prusa/process/0.12mm SPEED @CORE One 0.25.json @@ -10,5 +10,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "45", "initial_layer_speed": "25", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25", + "small_perimeter_speed": "150", + "outer_wall_speed": "150", + "inner_wall_speed": "150" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json index a61d130cb5..ec754dc350 100644 --- a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json +++ b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.25.json @@ -10,5 +10,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "45", "initial_layer_speed": "25", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25", + "gap_infill_speed": "45", + "small_perimeter_speed": "45", + "outer_wall_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json index 35b0d2c525..101e7f0968 100644 --- a/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json +++ b/resources/profiles/Prusa/process/0.12mm STRUCTURAL @CORE One 0.3.json @@ -12,5 +12,8 @@ "initial_layer_infill_speed": "60", "initial_layer_speed": "45", "top_surface_acceleration": "1500", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3", + "small_perimeter_speed": "45", + "inner_wall_speed": "70", + "outer_wall_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json index e8518fdb25..c4d772993f 100644 --- a/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json +++ b/resources/profiles/Prusa/process/0.12mm Speed @MINIIS.json @@ -31,7 +31,8 @@ "overhang_1_4_speed": "60", "internal_solid_infill_acceleration": "2500", "sparse_infill_acceleration": "2500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MINIIS 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json index abaef8f727..76ce6b9221 100644 --- a/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json +++ b/resources/profiles/Prusa/process/0.12mm Speed @MK3.5.json @@ -31,7 +31,8 @@ "overhang_1_4_speed": "60", "internal_solid_infill_acceleration": "2500", "sparse_infill_acceleration": "2500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MK3.5 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json index f0d03268c4..72175e280d 100644 --- a/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json +++ b/resources/profiles/Prusa/process/0.12mm Standard @MINIIS.json @@ -36,7 +36,9 @@ "internal_solid_infill_acceleration": "2500", "sparse_infill_acceleration": "2500", "travel_acceleration": "3000", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MINIIS 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json index 6099147be4..8f4b41b380 100644 --- a/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json +++ b/resources/profiles/Prusa/process/0.12mm Standard @MK3.5.json @@ -36,7 +36,9 @@ "internal_solid_infill_acceleration": "2500", "sparse_infill_acceleration": "2500", "travel_acceleration": "3000", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MK3.5 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json index 58a8211986..81711734a1 100644 --- a/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json +++ b/resources/profiles/Prusa/process/0.15mm High Flow @MINIIS.json @@ -29,7 +29,8 @@ "inner_wall_acceleration": "3500", "outer_wall_acceleration": "2500", "bridge_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MINIIS 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json index 92db093a4c..a3ecfea49b 100644 --- a/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json +++ b/resources/profiles/Prusa/process/0.15mm High Flow @MK3.5.json @@ -29,7 +29,8 @@ "inner_wall_acceleration": "3500", "outer_wall_acceleration": "2500", "bridge_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MK3.5 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json index 8e5f0cab2d..4600a136a8 100644 --- a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.25.json @@ -10,5 +10,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "45", "initial_layer_speed": "25", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25", + "small_perimeter_speed": "150", + "inner_wall_speed": "150", + "outer_wall_speed": "150" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json index 2c3b531050..e08b21a26f 100644 --- a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.15mm SPEED @MK4S 0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -16,5 +16,6 @@ "internal_solid_infill_acceleration": "6000", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "support_threshold_angle": "35" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json index fa9fb8c30c..50ad496cd2 100644 --- a/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/process/0.15mm SPEED @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.15mm SPEED @MK4S HF0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_1_4_speed": "50", "overhang_3_4_speed": "60%", "sparse_infill_speed": "300", "travel_speed": "350", @@ -18,5 +18,6 @@ "internal_solid_infill_acceleration": "6000", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "support_threshold_angle": "35" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json index 55e9dc654c..51886f189e 100644 --- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.25.json @@ -10,5 +10,8 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "45", "initial_layer_speed": "25", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.25", + "gap_infill_speed": "45", + "small_perimeter_speed": "45", + "outer_wall_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json index fd2d410e48..017b232df4 100644 --- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.15mm STRUCTURAL @MK4S 0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "sparse_infill_speed": "120", "travel_speed": "350", "travel_acceleration": "7000", diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json index 2cecda0dd0..765d0efa49 100644 --- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.15mm STRUCTURAL @MK4S 0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json index 2f58de84e9..0024001fd9 100644 --- a/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.15mm STRUCTURAL @CORE One 0.6.json @@ -4,9 +4,9 @@ "inherits": "0.15mm STRUCTURAL @MK4S 0.6", "from": "system", "instantiation": "true", - "inner_wall_speed": "80", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "70%", + "inner_wall_speed": "70", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "70%", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -18,5 +18,6 @@ "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6", "inner_wall_acceleration": "2500", "outer_wall_acceleration": "1500", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "gap_infill_speed": "70" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json index 30d9a165d5..3aa3019d76 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS 0.25.json @@ -29,7 +29,8 @@ "internal_solid_infill_acceleration": "2500", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MINIIS 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json index 853e0e01e6..6f6a9cffcd 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @MINIIS.json @@ -29,7 +29,8 @@ "internal_solid_infill_acceleration": "2500", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MINIIS 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json index 09c562d356..e322f1ce63 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5 0.25.json @@ -29,7 +29,8 @@ "internal_solid_infill_acceleration": "2500", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.09", + "support_bottom_interface_spacing": "0.09", "compatible_printers": [ "Prusa MK3.5 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json index 175c896845..31eb1443bb 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @MK3.5.json @@ -29,7 +29,8 @@ "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", "bridge_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.17", + "support_bottom_interface_spacing": "0.17", "compatible_printers": [ "Prusa MK3.5 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json index b6fe166ce1..362ed653d2 100644 --- a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.25.json @@ -29,7 +29,9 @@ "internal_solid_infill_acceleration": "2500", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MINIIS 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json index 606e52ecb7..5cd6746563 100644 --- a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json +++ b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS 0.6.json @@ -37,7 +37,10 @@ "inner_wall_acceleration": "2500", "outer_wall_acceleration": "1500", "bridge_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json index 3f1a5c6825..d61a785155 100644 --- a/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json +++ b/resources/profiles/Prusa/process/0.15mm Standard @MINIIS.json @@ -33,7 +33,8 @@ "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", "bridge_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MINIIS 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json index eca3cdad8c..3d55cc1e39 100644 --- a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.25.json @@ -29,7 +29,9 @@ "internal_solid_infill_acceleration": "2500", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", "compatible_printers": [ "Prusa MK3.5 0.25 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json index 6c6a80a261..c0087d57ea 100644 --- a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json +++ b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5 0.6.json @@ -37,7 +37,11 @@ "inner_wall_acceleration": "2500", "outer_wall_acceleration": "1500", "bridge_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json index 4044df4712..e6161e5896 100644 --- a/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json +++ b/resources/profiles/Prusa/process/0.15mm Standard @MK3.5.json @@ -28,7 +28,8 @@ "internal_solid_infill_acceleration": "2500", "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", - "support_top_z_distance": "0.1", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", "compatible_printers": [ "Prusa MK3.5 0.4 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json b/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json index d0ca7859df..15096ebd6b 100644 --- a/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json +++ b/resources/profiles/Prusa/process/0.16mm SPEED @CORE One 0.3.json @@ -13,5 +13,8 @@ "initial_layer_infill_speed": "60", "initial_layer_speed": "45", "top_surface_acceleration": "1500", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3", + "small_perimeter_speed": "160", + "inner_wall_speed": "160", + "outer_wall_speed": "160" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json b/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json index 192682e5b7..4e11371cfe 100644 --- a/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json +++ b/resources/profiles/Prusa/process/0.16mm STRUCTURAL @CORE One 0.3.json @@ -12,5 +12,8 @@ "initial_layer_infill_speed": "60", "initial_layer_speed": "45", "top_surface_acceleration": "1500", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3", + "small_perimeter_speed": "50", + "inner_wall_speed": "70", + "outer_wall_speed": "50" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json index aeca348889..15363df16c 100644 --- a/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm High Flow @MINIIS 0.6.json @@ -36,5 +36,10 @@ "outer_wall_acceleration": "4000", "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", - "overhang_1_4_speed": "45" + "overhang_1_4_speed": "45", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json index 2aa0d96b93..c9056822db 100644 --- a/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm High Flow @MK3.5 0.6.json @@ -36,5 +36,10 @@ "outer_wall_acceleration": "4000", "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", - "overhang_1_4_speed": "45" + "overhang_1_4_speed": "45", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json index 3fe89b38a6..7e0f0042c0 100644 --- a/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm SOLUBLE FULL @CORE One 0.4.json @@ -4,12 +4,15 @@ "inherits": "0.20mm SOLUBLE FULL @MK4S 0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes!~/.*HF_NOZZLE.*/", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", "support_interface_top_layers": "3", "initial_layer_infill_speed": "100", - "initial_layer_speed": "45" + "initial_layer_speed": "45", + "small_perimeter_speed": "50", + "inner_wall_speed": "70", + "outer_wall_speed": "50" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json index 49c4c28280..222663644c 100644 --- a/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm SOLUBLE INTERFACE @CORE One 0.4.json @@ -4,12 +4,15 @@ "inherits": "0.20mm SOLUBLE INTERFACE @MK4S 0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes!~/.*HF_NOZZLE.*/", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", "support_interface_top_layers": "3", "initial_layer_infill_speed": "100", - "initial_layer_speed": "45" + "initial_layer_speed": "45", + "small_perimeter_speed": "50", + "inner_wall_speed": "70", + "outer_wall_speed": "50" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json index df4d8e80cc..0f0cc78362 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.3.json @@ -13,5 +13,8 @@ "initial_layer_infill_speed": "60", "initial_layer_speed": "45", "top_surface_acceleration": "1500", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3", + "small_perimeter_speed": "160", + "inner_wall_speed": "160", + "outer_wall_speed": "160" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json index 9171ec4b21..79cd06680f 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.20mm SPEED @MK4S 0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -16,5 +16,6 @@ "internal_solid_infill_acceleration": "6000", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "support_threshold_angle": "35" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json index e7299809ea..20d64e324c 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.20mm SPEED @MK4S 0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json index 78446c1687..1bbd442a02 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One 0.6.json @@ -4,8 +4,8 @@ "inherits": "0.20mm SPEED @MK4S 0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "70%", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "70%", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -17,5 +17,8 @@ "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes!~/.*HF_NOZZLE.*/", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "small_perimeter_speed": "130", + "inner_wall_speed": "130", + "outer_wall_speed": "130" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json index 96433e26e8..5b9b42f34c 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.4.json @@ -4,8 +4,8 @@ "inherits": "0.20mm SPEED @MK4S HF0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "60%", + "overhang_3_4_speed": "50", + "overhang_4_4_speed": "70%", "sparse_infill_speed": "300", "travel_speed": "350", "travel_acceleration": "7000", @@ -18,5 +18,6 @@ "internal_solid_infill_acceleration": "6000", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "support_threshold_angle": "35" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json index 3ad26d4548..c7324713ea 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.20mm SPEED @MK4S HF0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json index 204f356661..8cb0eb8f1c 100644 --- a/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm SPEED @CORE One HF 0.6.json @@ -4,8 +4,8 @@ "inherits": "0.20mm SPEED @MK4S HF0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "70%", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "70%", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json index e7dd110d1d..d9b1a2ef54 100644 --- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.3.json @@ -12,5 +12,8 @@ "initial_layer_infill_speed": "60", "initial_layer_speed": "45", "top_surface_acceleration": "1500", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.3", + "small_perimeter_speed": "50", + "inner_wall_speed": "70", + "outer_wall_speed": "50" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json index 95d97fea4e..a139f2cd4f 100644 --- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.20mm STRUCTURAL @MK4S 0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json index c6fba65551..57c2968e0d 100644 --- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.20mm STRUCTURAL @MK4S 0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json index 5445f967b5..9bbd5097c8 100644 --- a/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm STRUCTURAL @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "0.20mm STRUCTURAL @MK4S 0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", + "overhang_3_4_speed": "30", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json index 2e2cb971fe..29f9977358 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @MINIIS 0.6.json @@ -34,5 +34,10 @@ "outer_wall_acceleration": "2000", "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", - "overhang_1_4_speed": "45" + "overhang_1_4_speed": "45", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json index fb256ecc05..79c38ffeea 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @MK3.5 0.6.json @@ -34,5 +34,10 @@ "outer_wall_acceleration": "2000", "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", - "overhang_1_4_speed": "45" + "overhang_1_4_speed": "45", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json index 6ed283fa8c..d27e89b756 100644 --- a/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm Standard @MINIIS 0.6.json @@ -29,6 +29,11 @@ "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", "overhang_1_4_speed": "45", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json b/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json index f6e1946a04..e4b4f4b5d1 100644 --- a/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm Standard @MK3.5 0.6.json @@ -29,6 +29,11 @@ "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", "overhang_1_4_speed": "45", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json index 4521f5fbb1..f1784af6c5 100644 --- a/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json +++ b/resources/profiles/Prusa/process/0.25mm High Flow @MINIIS.json @@ -40,7 +40,11 @@ "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", "overhang_1_4_speed": "45", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json index 00faf7f563..0cb9257ddf 100644 --- a/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json +++ b/resources/profiles/Prusa/process/0.25mm High Flow @MK3.5.json @@ -40,7 +40,11 @@ "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", "overhang_1_4_speed": "45", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json index bfe931bc62..cb087eb345 100644 --- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json +++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.25mm SPEED @MK4S 0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json index 4cd0500e7b..621c94e9d8 100644 --- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One 0.6.json @@ -4,8 +4,8 @@ "inherits": "0.25mm SPEED @MK4S 0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "70%", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "70%", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -17,5 +17,8 @@ "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes!~/.*HF_NOZZLE.*/", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "small_perimeter_speed": "75", + "inner_wall_speed": "95", + "outer_wall_speed": "75" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json index b0b066e261..634c502f73 100644 --- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.4.json @@ -4,8 +4,8 @@ "inherits": "0.25mm SPEED @MK4S HF0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "60%", + "overhang_3_4_speed": "50", + "overhang_4_4_speed": "70%", "sparse_infill_speed": "300", "travel_speed": "350", "travel_acceleration": "7000", @@ -13,10 +13,11 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "100", "initial_layer_speed": "45", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes=~/.*HF_NOZZLE.*/", +"compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.4 and printer_notes=~/.*HF_NOZZLE.*/", "sparse_infill_acceleration": "7000", "internal_solid_infill_acceleration": "6000", "inner_wall_acceleration": "6000", "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "top_surface_acceleration": "2000", + "support_threshold_angle": "35" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json index 20634c06e1..268891fb46 100644 --- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.25mm SPEED @MK4S HF0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json index 493f82b29b..bb26e69f5d 100644 --- a/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/process/0.25mm SPEED @CORE One HF 0.6.json @@ -4,8 +4,8 @@ "inherits": "0.25mm SPEED @MK4S HF0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "70%", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "70%", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json index a89610e3ee..c4d22efeb2 100644 --- a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json +++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.25mm STRUCTURAL @MK4S 0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json index 5418273bb2..96a614266d 100644 --- a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "0.25mm STRUCTURAL @MK4S 0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", + "overhang_3_4_speed": "30", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json index 6392a2c0f7..978f3f94d0 100644 --- a/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/process/0.25mm STRUCTURAL @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.25mm STRUCTURAL @MK4S HF0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json b/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json index c5085cbf7c..33e3de92dc 100644 --- a/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json +++ b/resources/profiles/Prusa/process/0.25mm Speed @MINIIS.json @@ -30,7 +30,11 @@ "overhang_1_4_speed": "45", "travel_speed": "300", "internal_solid_infill_acceleration": "3000", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json b/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json index 6dec0d7f5c..7ebe2664ef 100644 --- a/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json +++ b/resources/profiles/Prusa/process/0.25mm Speed @MK3.5.json @@ -30,7 +30,11 @@ "overhang_1_4_speed": "45", "travel_speed": "300", "internal_solid_infill_acceleration": "3000", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json index e98b851fc4..4191366100 100644 --- a/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json +++ b/resources/profiles/Prusa/process/0.25mm Standard @MINIIS.json @@ -29,7 +29,11 @@ "gap_infill_speed": "60", "support_speed": "80", "travel_speed": "300", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json index e9c0451d61..64e099d97e 100644 --- a/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json +++ b/resources/profiles/Prusa/process/0.25mm Standard @MK3.5.json @@ -29,7 +29,11 @@ "gap_infill_speed": "60", "support_speed": "80", "travel_speed": "300", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json b/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json index a1f896b3c0..e493e19467 100644 --- a/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/process/0.28mm DRAFT @CORE One HF 0.4.json @@ -4,7 +4,7 @@ "inherits": "0.28mm DRAFT @MK4S HF0.4", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "support_threshold_angle": "35", "outer_wall_acceleration": "3000", "inner_wall_acceleration": "6000", diff --git a/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json b/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json index 0ecac72e60..db88957c69 100644 --- a/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json +++ b/resources/profiles/Prusa/process/0.30mm DETAIL @CORE One 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.30mm DETAIL @MK4S 0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "35", - "top_surface_speed": "2000", + "overhang_3_4_speed": "35", + "top_surface_acceleration": "2000", "inner_wall_acceleration": "2500", "internal_solid_infill_acceleration": "5000", "sparse_infill_acceleration": "7000", @@ -15,5 +15,6 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "55", "initial_layer_speed": "45", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/", + "gap_infill_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json b/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json index 90a7a28fb8..dcc20a87bd 100644 --- a/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json +++ b/resources/profiles/Prusa/process/0.30mm Detail @MINIIS.json @@ -21,7 +21,11 @@ "bottom_shell_thickness": "0.5", "bottom_shell_layers": "2", "travel_speed": "300", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.35", "compatible_printers": [ "Prusa MINIIS 0.8 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json b/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json index 7d4ed7d622..975851d38f 100644 --- a/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json +++ b/resources/profiles/Prusa/process/0.30mm Detail @MK3.5.json @@ -21,7 +21,11 @@ "bottom_shell_thickness": "0.5", "bottom_shell_layers": "2", "travel_speed": "300", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.35", "compatible_printers": [ "Prusa MK3.5 0.8 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json index 8477a7c0f9..d4be25be9a 100644 --- a/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/process/0.30mm SPEED @CORE One HF 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.30mm SPEED @MK4S HF0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", - "top_surface_speed": "2000", + "overhang_3_4_speed": "45", + "top_surface_acceleration": "2000", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json index d8cb0916af..7426aa3a21 100644 --- a/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/process/0.30mm STRUCTURAL @CORE One HF 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.30mm STRUCTURAL @MK4S HF0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "40", - "top_surface_speed": "2000", + "overhang_3_4_speed": "40", + "top_surface_acceleration": "2000", "support_speed": "100", "support_interface_speed": "55%", "travel_speed": "350", @@ -18,6 +18,5 @@ "sparse_infill_acceleration": "6000", "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/", "inner_wall_acceleration": "2500", - "outer_wall_acceleration": "1500", - "top_surface_acceleration": "2000" + "outer_wall_acceleration": "1500" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json index a1fbbc989f..7602017ccd 100644 --- a/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json +++ b/resources/profiles/Prusa/process/0.32mm High Flow @MINIIS.json @@ -37,7 +37,11 @@ "outer_wall_acceleration": "4000", "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json index 43a0733ac4..b295a0b1b3 100644 --- a/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json +++ b/resources/profiles/Prusa/process/0.32mm High Flow @MK3.5.json @@ -39,7 +39,11 @@ "outer_wall_acceleration": "4000", "bridge_acceleration": "1500", "internal_solid_infill_acceleration": "3000", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json index 549b62c466..8b4b7511b1 100644 --- a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One 0.6.json @@ -4,8 +4,8 @@ "inherits": "0.32mm SPEED @MK4S 0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "70%", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "70%", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json index 1471abb700..55594a5dd2 100644 --- a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.32mm SPEED @MK4S HF0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "50", + "overhang_3_4_speed": "50", "support_interface_speed": "50%", "travel_speed": "350", "travel_acceleration": "7000", diff --git a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json index e9bde33023..533da07e95 100644 --- a/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/process/0.32mm SPEED @CORE One HF 0.6.json @@ -4,9 +4,9 @@ "inherits": "0.32mm SPEED @MK4S HF0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "35", - "overhang_3_4_speed": "70%", - "top_surface_speed": "2000", + "overhang_3_4_speed": "35", + "overhang_4_4_speed": "70%", + "top_surface_acceleration": "2000", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -17,6 +17,5 @@ "sparse_infill_acceleration": "7000", "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes=~/.*HF_NOZZLE.*/", "inner_wall_acceleration": "6000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "outer_wall_acceleration": "3000" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json index e52aa90a5f..a652b7097c 100644 --- a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json +++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One 0.6.json @@ -4,7 +4,7 @@ "inherits": "0.32mm STRUCTURAL @MK4S 0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "30", + "overhang_3_4_speed": "30", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json index a1f851d518..7fb4500b02 100644 --- a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.5.json @@ -4,7 +4,7 @@ "inherits": "0.32mm STRUCTURAL @MK4S HF0.5", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", + "overhang_3_4_speed": "45", "support_speed": "120", "support_interface_speed": "50%", "travel_speed": "350", diff --git a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json index 2a3f2ce950..887768ee8e 100644 --- a/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/process/0.32mm STRUCTURAL @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "0.32mm STRUCTURAL @MK4S HF0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "35", + "overhang_3_4_speed": "35", "support_speed": "110", "support_interface_speed": "50%", "travel_speed": "350", diff --git a/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json index 411a870db7..c1edeeb9eb 100644 --- a/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json +++ b/resources/profiles/Prusa/process/0.32mm Standard @MINIIS.json @@ -30,7 +30,11 @@ "top_surface_speed": "55", "gap_infill_speed": "45", "travel_speed": "300", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json index 1f4001c0fb..5674aed58e 100644 --- a/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json +++ b/resources/profiles/Prusa/process/0.32mm Standard @MK3.5.json @@ -30,7 +30,11 @@ "top_surface_speed": "55", "gap_infill_speed": "45", "travel_speed": "300", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json index bb7145adc8..edc3044976 100644 --- a/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json +++ b/resources/profiles/Prusa/process/0.35mm Standard @MINIIS.json @@ -30,7 +30,11 @@ "top_surface_speed": "55", "gap_infill_speed": "45", "travel_speed": "300", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MINIIS 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json index 9ff6c800c2..82e2034788 100644 --- a/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json +++ b/resources/profiles/Prusa/process/0.35mm Standard @MK3.5.json @@ -30,7 +30,11 @@ "top_surface_speed": "55", "gap_infill_speed": "45", "travel_speed": "300", - "support_top_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_bottom_interface_spacing": "0.22", + "support_interface_spacing": "0.25", "compatible_printers": [ "Prusa MK3.5 0.6 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json b/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json index 593fda4beb..ea55022d19 100644 --- a/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json +++ b/resources/profiles/Prusa/process/0.40mm High Flow @MINIIS.json @@ -41,7 +41,11 @@ "inner_wall_acceleration": "3000", "outer_wall_acceleration": "2500", "bridge_acceleration": "1000", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.35", "compatible_printers": [ "Prusa MINIIS 0.8 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json b/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json index 056c8cb2be..79fda27a93 100644 --- a/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json +++ b/resources/profiles/Prusa/process/0.40mm High Flow @MK3.5.json @@ -41,7 +41,11 @@ "inner_wall_acceleration": "3000", "outer_wall_acceleration": "2500", "bridge_acceleration": "1000", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.35", "compatible_printers": [ "Prusa MK3.5 0.8 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json b/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json index 4567cd1dd7..a92c5eb3dd 100644 --- a/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json +++ b/resources/profiles/Prusa/process/0.40mm QUALITY @CORE One 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.40mm QUALITY @MK4S 0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "35", - "top_surface_speed": "2000", + "overhang_3_4_speed": "35", + "top_surface_acceleration": "2000", "inner_wall_acceleration": "2500", "internal_solid_infill_acceleration": "5000", "sparse_infill_acceleration": "7000", diff --git a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json index e0b870c9ad..bb913bcabd 100644 --- a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.6.json @@ -4,9 +4,9 @@ "inherits": "0.40mm SPEED @MK4S HF0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "35", - "overhang_3_4_speed": "70%", - "top_surface_speed": "2000", + "overhang_3_4_speed": "35", + "overhang_4_4_speed": "70%", + "top_surface_acceleration": "2000", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -17,6 +17,5 @@ "sparse_infill_acceleration": "7000", "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.6 and printer_notes=~/.*HF_NOZZLE.*/", "inner_wall_acceleration": "6000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "2000" + "outer_wall_acceleration": "3000" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json index 142556619a..7e6f2c156c 100644 --- a/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/process/0.40mm SPEED @CORE One HF 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.40mm SPEED @MK4S HF0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", - "top_surface_speed": "2000", + "overhang_3_4_speed": "45", + "top_surface_acceleration": "2000", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -14,5 +14,7 @@ "initial_layer_speed": "45", "internal_solid_infill_acceleration": "5000", "sparse_infill_acceleration": "7000", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/", + "small_perimeter_speed": "85", + "outer_wall_speed": "85" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json index adfba858f2..fe8697d887 100644 --- a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.6.json @@ -4,7 +4,7 @@ "inherits": "0.40mm STRUCTURAL @MK4S HF0.6", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "35", + "overhang_3_4_speed": "35", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json index e651c26ce3..6fbe39f6ba 100644 --- a/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/process/0.40mm STRUCTURAL @CORE One HF 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.40mm STRUCTURAL @MK4S HF0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "40", - "top_surface_speed": "2000", + "overhang_3_4_speed": "40", + "top_surface_acceleration": "2000", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", @@ -16,6 +16,5 @@ "sparse_infill_acceleration": "6000", "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes=~/.*HF_NOZZLE.*/", "inner_wall_acceleration": "2500", - "outer_wall_acceleration": "1500", - "top_surface_acceleration": "2000" + "outer_wall_acceleration": "1500" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json b/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json index c040568d16..a29bbbdbbe 100644 --- a/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json +++ b/resources/profiles/Prusa/process/0.40mm Standard @MINIIS.json @@ -40,7 +40,11 @@ "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", "bridge_acceleration": "1000", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.35", "compatible_printers": [ "Prusa MINIIS 0.8 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json b/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json index 31fddc238b..41659260f1 100644 --- a/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json +++ b/resources/profiles/Prusa/process/0.40mm Standard @MK3.5.json @@ -41,7 +41,11 @@ "inner_wall_acceleration": "2000", "outer_wall_acceleration": "1500", "bridge_acceleration": "1000", + "support_base_pattern_spacing": "2", "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_bottom_interface_spacing": "0.25", + "support_interface_spacing": "0.35", "compatible_printers": [ "Prusa MK3.5 0.8 nozzle" ] diff --git a/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json b/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json index 6037cbdbda..5d350f3738 100644 --- a/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json +++ b/resources/profiles/Prusa/process/0.55mm DRAFT @CORE One 0.8.json @@ -4,7 +4,7 @@ "inherits": "0.55mm DRAFT @MK4S 0.8", "from": "system", "instantiation": "true", - "top_surface_speed": "2000", + "top_surface_acceleration": "2000", "inner_wall_acceleration": "2500", "internal_solid_infill_acceleration": "5000", "sparse_infill_acceleration": "7000", @@ -14,5 +14,6 @@ "support_interface_top_layers": "3", "initial_layer_infill_speed": "55", "initial_layer_speed": "45", - "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/" + "compatible_printers_condition": "printer_notes=~/.*PRINTER_MODEL_COREONE.*/ and nozzle_diameter[0]==0.8 and printer_notes!~/.*HF_NOZZLE.*/", + "inner_wall_speed": "45" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json b/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json index 11b159f114..f9270671a2 100644 --- a/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json +++ b/resources/profiles/Prusa/process/0.55mm SPEED @CORE One HF 0.8.json @@ -4,8 +4,8 @@ "inherits": "0.55mm SPEED @MK4S HF0.8", "from": "system", "instantiation": "true", - "overhang_2_4_speed": "45", - "top_surface_speed": "2000", + "overhang_3_4_speed": "45", + "top_surface_acceleration": "2000", "travel_speed": "350", "travel_acceleration": "7000", "default_acceleration": "3000", diff --git a/resources/profiles/Prusa/process/process_common_MK3.5.json b/resources/profiles/Prusa/process/process_common_MK3.5.json index a5471d2bf6..4873772bf7 100644 --- a/resources/profiles/Prusa/process/process_common_MK3.5.json +++ b/resources/profiles/Prusa/process/process_common_MK3.5.json @@ -55,10 +55,13 @@ "raft_contact_distance": "0.15", "raft_expansion": "1.5", "raft_first_layer_density": "90%", - "raft_first_layer_expansion": "3.5", "support_threshold_angle": "40", "support_interface_bottom_layers": "0", "support_base_pattern": "rectilinear", "support_interface_top_layers": "3", - "support_top_z_distance": "0.17" + "raft_first_layer_expansion": "3", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_spacing": "0.2", + "support_top_z_distance": "0.2" } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/process_common_miniis.json b/resources/profiles/Prusa/process/process_common_miniis.json index 443fae9dc3..533d660224 100644 --- a/resources/profiles/Prusa/process/process_common_miniis.json +++ b/resources/profiles/Prusa/process/process_common_miniis.json @@ -55,10 +55,13 @@ "raft_contact_distance": "0.15", "raft_expansion": "1.5", "raft_first_layer_density": "90%", - "raft_first_layer_expansion": "3.5", "support_threshold_angle": "40", "support_interface_bottom_layers": "0", "support_base_pattern": "rectilinear", "support_interface_top_layers": "3", - "support_top_z_distance": "0.17" + "raft_first_layer_expansion": "3", + "support_base_pattern_spacing": "2", + "support_bottom_interface_spacing": "0.2", + "support_interface_spacing": "0.2", + "support_top_z_distance": "0.2" } \ No newline at end of file diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html index 4f6b807b9d..efaea1c8ea 100644 --- a/resources/web/flush/WipingDialog.html +++ b/resources/web/flush/WipingDialog.html @@ -137,40 +137,6 @@ display: inline-block; } - .btn { - display: inline-block; - padding: 6px 9px; - border: 2px solid transparent; - border-radius: 12px; - font-size: 12px; - text-align: center; - cursor: pointer; - transition: all 0.3s; - } - - .btn-ok { - color: #fff; - background-color: #009688; - } - .btn-ok:hover { - background-color: #26A69A; - } - - .btn-cancel { - color: black; - background-color: white; - border: 1px solid black; - } - .btn-cancel:hover { - background-color: #eeeeee; - } - - body.dark-mode button.btn-cancel { - background-color: #2d2d31; - color: #e0e0e0; - border: 1px solid #e0e0e0; - } - select { padding: 6px 9px; border: 1px solid #dbdbdb; @@ -197,7 +163,7 @@ .button-container { display: flex; justify-content: center; - gap: 10px; + gap: 0px; margin: 10px; } @@ -266,15 +232,6 @@ position: sticky; z-index: 11; } - - body.dark-mode .btn-ok { - background-color: #009688; - } - - body.dark-mode .btn-dark { - background-color: #34495e; - } - body.dark-mode select { background-color: #2d2d31; color: white; @@ -295,6 +252,8 @@ + +
@@ -303,14 +262,14 @@ in Orca Slicer > Preferences.
-
- +