diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 0000000000..a670e9e1b1 --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,47 @@ +# clang-tidy configuration. Only missing includes are reported for now: a file +# should include the header for every symbol it uses, not rely on the +# precompiled header or another header's includes. Run with --fix to add them. +Checks: '-*,misc-include-cleaner' +CheckOptions: + # Missing includes only. Builds without the precompiled header break on these. + misc-include-cleaner.UnusedIncludes: false + # Headers that declare a symbol but are not the one to include: per-platform + # implementations of wxWidgets and Boost.Thread (a Linux run would suggest the + # GTK or pthread one), library internals and forward declarations, CPython's + # headers behind Python.h, curl's behind curl.h, oneTBB's behind tbb/, and + # admesh's stl.h, which the include path also exposes without its directory. + # FFmpeg's C headers are left alone because they are only included inside + # extern "C", which an inserted include would miss. OS-specific headers (GLib, + # GTK, D-Bus, POSIX, the Windows SDK) are only used inside platform #if blocks, + # and an include added at the top of the file would break the other platforms' + # builds. A symbol these provide is not reported missing. + # Write every / as [/\\] so the patterns also match Windows paths. + # No comments inside the block below, because a # there silently becomes part of a pattern. + misc-include-cleaner.IgnoreHeaders: >- + wx[/\\](gtk|gtk1|msw|osx|unix|x11|motif|univ|qt|dfb|generic|private)[/\\].*; + .*[/\\]detail[/\\].*; + .*[/\\]impl[/\\].*; + .*_fwd\.hpp; + python3\.[0-9]+[/\\].*; + bits[/\\].*; + imconfig\.h; + expat_external\.h; + admesh[/\\]stl\.h; + boost[/\\]thread[/\\](pthread|win32)[/\\].*; + boost[/\\]regex[/\\]v[0-9]+[/\\].*; + curl[/\\](easy|multi|system|urlapi|header|options|websockets|mprintf)\.h; + oneapi[/\\]tbb[/\\].*; + opencv2[/\\]core[/\\]hal[/\\].*; + openssl[/\\]ossl_typ\.h; + libav[a-z]+[/\\].*; + libsw[a-z]+[/\\].*; + glib-2\.0[/\\].*; + gtk-3\.0[/\\].*; + dbus-1\.0[/\\].*; + sys[/\\].*; + unistd\.h; + strings\.h; + fcntl\.h; + termios\.h; + [/\\](um|shared)[/\\].*; + sal\.h diff --git a/.claude/skills/orca-wxwidgets/SKILL.md b/.claude/skills/orca-wxwidgets/SKILL.md index e3ec65b4a8..263d2e390f 100644 --- a/.claude/skills/orca-wxwidgets/SKILL.md +++ b/.claude/skills/orca-wxwidgets/SKILL.md @@ -206,7 +206,8 @@ known class with a pitfall entry and a fixing commit. - **macOS:** capture-lost is never sent (a leaked capture freezes all clicks); transient popups hover- dismiss across a gap — anchor flush and re-verify the cursor; native modals (file/dir dialogs, native message boxes) and generic progress dialogs re-activate the main window, so re-raise a secondary window - afterwards with a deferred, liveness-guarded `Raise()`; a live menu accelerator consumes the key before + afterwards with a deferred, liveness-guarded `Raise()` — but never `Raise()` a `wxPopupWindow`, which makes + it the key window; a live menu accelerator consumes the key before any wx key event; Control+click arrives as a right-click. - **Windows:** `IsDark()` and `wxSYS_COLOUR_*` follow the system app mode, not Orca's theme — use `dark_mode()`; menu bitmaps follow `check_dark_mode()`; windows are not double-buffered by default in diff --git a/.claude/skills/orca-wxwidgets/references/popups-menus.md b/.claude/skills/orca-wxwidgets/references/popups-menus.md index 00c666cfb7..be1abb69a8 100644 --- a/.claude/skills/orca-wxwidgets/references/popups-menus.md +++ b/.claude/skills/orca-wxwidgets/references/popups-menus.md @@ -57,8 +57,9 @@ Contents: [Rules](#rules) · [1. Choosing the window kind](#1-choosing-the-windo 17. Don't shrink a dropdown below two rows to fit the screen. (§7) 18. Content that needs typing focus or hosts a `wxWebView` uses a frameless `wxDialog` that hides on deactivation, not a transient popup. (§10) -19. Display-only overlays (HUDs, toasts) use a plain `wxPopupWindow`: it never takes focus and never - auto-dismisses. (§4, §10) +19. Display-only overlays (HUDs, toasts) use a plain `wxPopupWindow`: `Show()` never gives it focus and it + never auto-dismisses. Never `Raise()` any `wxPopupWindow`: `Raise()` is for top-level windows only, and on + macOS it makes the popup the key window. (§4, §5, §10) 20. On MSW, don't `SetFocus()` another window on hover while `wxCurrentPopupWindow` is non-null. (§8) 21. Menu items use `wxID_ANY` and read `item->GetId()`. `wxNewId()` is deprecated. (§13) 22. Set a menu item's bitmap before `Append`. Don't expect icons on check or radio items. Never call @@ -356,6 +357,13 @@ compensates for (§6). with `ShowWithoutActivating` → `setHidesOnDeactivate:YES` + `orderFront` (`src/osx/carbon/popupwin.cpp:56-75`, `nonownedwnd.mm:938-945`). When the app deactivates, Cocoa hides the panel and shows it again on reactivation. wx never calls `OnDismiss`, and `IsShown()` stays true. This applies to plain `wxPopupWindow` overlays too. +- `Raise()` activates the popup. It is `makeKeyAndOrderFront` (`src/osx/nonownedwnd_osx.cpp:289-295`, + `nonownedwnd.mm:897-899`), and `wxNSPanel` answers `canBecomeKeyWindow` with YES (`nonownedwnd.mm:271`), so + the popup becomes the key window. Keys go to it, and the frame loses key status: `windowDidResignKey` → + `HandleActivated(0, false)` → `wxEVT_ACTIVATE(false)` on the frame (`nonownedwnd.mm:567-576`, + `nonownedwnd_osx.cpp:303-310`). Hiding the key popup gives key back to the frame, which then gets + `wxEVT_ACTIVATE(true)` (observed; AppKit behaviour, not in the wx tree). A popup at `NSPopUpMenuWindowLevel` + is already above its frame, so `Raise()` buys nothing. - Capture: `Show(true)` makes `m_child` capture the mouse ("Assume that the mouse is outside the popup to begin with", `popupcmn.cpp:421-426`). `OnIdle` releases the capture while the cursor is inside and re-captures it outside, but only when the mouse position has changed since the last idle pass. `s_posLast` is a @@ -739,8 +747,26 @@ created with `wxBORDER_NONE | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | wxF - **Rule:** For overlays that must never take keyboard focus (above a GL surface), use a plain `wxPopupWindow(top, wxBORDER_NONE)`, not a `wxFrame`. **Why:** A frame took the X input focus and swallowed every shortcut until the user clicked the canvas. A popup - window cannot take focus. On macOS these overlays hide while the app is inactive (§5). + window does not take focus when shown. On macOS these overlays hide while the app is inactive (§5). Cite: `CAD/DesignCanvas.cpp` (`m_hud`, `m_status_hud`). +- **Rule:** Never `Raise()` a `wxPopupWindow`. To bring an overlay up, `Show()` it if it is hidden, then + `Move()` it. + **Why:** `Raise()` is documented for top-level windows only (`interface/wx/window.h:3028-3029`), and a popup + derives from `wxNonOwnedWindow`, not `wxTopLevelWindow` (`include/wx/popupwin.h:33`). On macOS it makes the + popup the key window (§5): the popup takes the keys meant for the window below it, and the frame receives + `wxEVT_ACTIVATE(false)`. A frame activate handler that hides the overlay on deactivation and re-places it on + activation then loops: each `Raise()` deactivates the frame, the hide reactivates it, and the re-place raises + again, recursing until the main thread's stack overflows. A popup's `Show()` is `ShowWithoutActivating` + and is safe. + ```cpp + // Wrong + if (!overlay->IsShown()) overlay->Show(); + overlay->Move(pos); + overlay->Raise(); + // Right + if (!overlay->IsShown()) overlay->Show(); + overlay->Move(pos); + ``` ## 11. wxComboCtrl / wxComboPopup diff --git a/.claude/skills/orca-wxwidgets/references/windows-dialogs.md b/.claude/skills/orca-wxwidgets/references/windows-dialogs.md index 6b405f942c..1c5be5af4c 100644 --- a/.claude/skills/orca-wxwidgets/references/windows-dialogs.md +++ b/.claude/skills/orca-wxwidgets/references/windows-dialogs.md @@ -428,7 +428,8 @@ this function does *not* show it", top-level windows only (`interface/wx/window. since 3.3 (`docs/changes.txt:144-146`). **[source]** MSW = `::SetForegroundWindow`, subject to the foreground lock — Windows may only flash the taskbar button (`src/msw/toplevel.cpp:650-655`); GTK = `gtk_window_present` only if shown (`src/gtk/toplevel.cpp:1301-1310`; during a deferred X11 first show it -already counts as shown); macOS = `makeKeyAndOrderFront` only if shown (`src/osx/nonownedwnd_osx.cpp:289-295`, `src/osx/cocoa/nonownedwnd.mm:896-899`). +already counts as shown); macOS = `makeKeyAndOrderFront` only if shown (`src/osx/nonownedwnd_osx.cpp:289-295`, `src/osx/cocoa/nonownedwnd.mm:897-899`), +which also makes a `wxPopupWindow` the key window — never `Raise()` a popup (`references/popups-menus.md` §5, §10). **Enable.** `Enable(false)` on a parent disables children logically: `IsEnabled()` reflects ancestors, `IsThisEnabled()` the window's own flag (`interface/wx/window.h:3060-3070, 3116-3138`). **[source]** On MSW/macOS wx diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index a6d7a17dff..f1cc9a9723 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -49,28 +49,11 @@ jobs: key: ${{ inputs.cache-key }} - uses: lukka/get-cmake@latest - # The windows-11-arm runner needs CMake <= 3.31 (handled in the next step). - if: ${{ !(runner.os == 'Windows' && inputs.arch == 'arm64') }} with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). useCloudCache: true - - name: Install CMake 3.31.x (Windows ARM64) - # windows-11-arm ships CMake 4.x, which removed pre-3.5 policy - # compatibility AND has incomplete ASM_ARMASM linker modules - # (breaks Boost.Context on ARM64). Pin to the last 3.x release. - if: runner.os == 'Windows' && inputs.arch == 'arm64' - shell: pwsh - run: | - $ver = "3.31.6" - $url = "https://github.com/Kitware/CMake/releases/download/v$ver/cmake-$ver-windows-arm64.zip" - Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\cmake.zip" - Expand-Archive -Path "$env:RUNNER_TEMP\cmake.zip" -DestinationPath "$env:RUNNER_TEMP\cmake" -Force - $cmakeBin = "$env:RUNNER_TEMP\cmake\cmake-$ver-windows-arm64\bin" - if (-not (Test-Path "$cmakeBin\cmake.exe")) { throw "cmake.exe not found at $cmakeBin" } - Add-Content -Path $env:GITHUB_PATH -Value $cmakeBin - - name: setup dev on Windows if: runner.os == 'Windows' uses: microsoft/setup-msbuild@v3 diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 2ea72d0773..8c7674f4d7 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -54,28 +54,11 @@ jobs: fail-on-cache-miss: true - uses: lukka/get-cmake@latest - # The windows-11-arm runner needs CMake <= 3.31 (handled in the next step). - if: ${{ !(runner.os == 'Windows' && inputs.arch == 'arm64') }} with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). useCloudCache: true - - name: Install CMake 3.31.x (Windows ARM64) - # windows-11-arm ships CMake 4.x, which removed pre-3.5 policy - # compatibility AND has incomplete ASM_ARMASM linker modules - # (breaks Boost.Context on ARM64). Pin to the last 3.x release. - if: runner.os == 'Windows' && inputs.arch == 'arm64' - shell: pwsh - run: | - $ver = "3.31.6" - $url = "https://github.com/Kitware/CMake/releases/download/v$ver/cmake-$ver-windows-arm64.zip" - Invoke-WebRequest -Uri $url -OutFile "$env:RUNNER_TEMP\cmake.zip" - Expand-Archive -Path "$env:RUNNER_TEMP\cmake.zip" -DestinationPath "$env:RUNNER_TEMP\cmake" -Force - $cmakeBin = "$env:RUNNER_TEMP\cmake\cmake-$ver-windows-arm64\bin" - if (-not (Test-Path "$cmakeBin\cmake.exe")) { throw "cmake.exe not found at $cmakeBin" } - Add-Content -Path $env:GITHUB_PATH -Value $cmakeBin - # Compiler cache. Pushes save it, so main keeps it warm; pull requests # restore it and discard what they compiled. Objects are keyed on the # preprocessed source, the compiler and the flags, so a leg only ever diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 41ef0b1f4b..f5850d9fd7 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -44,14 +44,6 @@ jobs: uses: actions/download-artifact@v8 with: name: ${{ inputs.artifact }} - # run_unit_tests.sh installs the plugin tests' numpy with the uv the build stages - # beside them; the Windows arm64 build bundles none, so put one on PATH there. - - name: Install uv - if: runner.os == 'Windows' && runner.arch == 'ARM64' - uses: astral-sh/setup-uv@v10.2.0 - with: - version: "0.11.21" # ORCA_UV_VERSION in CMakeLists.txt - enable-cache: false - uses: lukka/get-cmake@latest with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version diff --git a/CMakeLists.txt b/CMakeLists.txt index f462525030..821d7e40c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,7 @@ set(ORCA_UV_SHA256_aarch64-apple-darwin "1f921d491ba5ffeea774eb04d6681ecee3 set(ORCA_UV_SHA256_x86_64-apple-darwin "f3c8e5708a84b920c18b691214d54d2b0da6b984789caae95d47c95120cb7765") set(ORCA_UV_SHA256_aarch64-unknown-linux-gnu "88e800834007cc5efd4675f166eb2a51e7e3ad19876d85fa8805a6fb5c922397") set(ORCA_UV_SHA256_x86_64-unknown-linux-gnu "8c88519b0ef0af9801fcdee419bbb12116bd9e6b18e162ae093c932d8b264050") +set(ORCA_UV_SHA256_aarch64-pc-windows-msvc "74e443f8004022dde57a1bd0d10c097830f9ea8feb4ec927db52cd5d805c2f48") set(ORCA_UV_SHA256_x86_64-pc-windows-msvc "ace861f360c6de2babedc1607d0f454b6b09a820dbc8182dc15af927e4df9589") # Version-scoped cache dir so a version bump invalidates the cached binary. @@ -173,7 +174,10 @@ if(NOT ORCA_BUNDLED_UV_EXECUTABLE) set(ORCA_UV_ARCH "x86_64-unknown-linux-gnu") endif() elseif(_orca_uv_proc MATCHES "aarch64|arm64|ARM64") - if(APPLE) + if(WIN32) + set(ORCA_UV_ARCH "aarch64-pc-windows-msvc") + set(ORCA_UV_EXT "zip") + elseif(APPLE) set(ORCA_UV_ARCH "aarch64-apple-darwin") else() set(ORCA_UV_ARCH "aarch64-unknown-linux-gnu") @@ -1301,6 +1305,14 @@ if (WIN32) endif() set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE) include(InstallRequiredSystemLibraries) + # A missing MSVC runtime is an error because an installer without it cannot start on a clean machine. + set(_orca_runtime_names ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}) + list(TRANSFORM _orca_runtime_names REPLACE "^.*/" "") + if (MSVC AND (NOT "msvcp140.dll" IN_LIST _orca_runtime_names OR NOT "vcruntime140.dll" IN_LIST _orca_runtime_names)) + set(_orca_runtime_error "CMake ${CMAKE_VERSION} did not find msvcp140.dll and vcruntime140.dll for MSVC ${MSVC_VERSION}. Update CMake to a release that supports this Visual Studio.") + message(WARNING "${_orca_runtime_error}") + install(CODE "message(FATAL_ERROR \"${_orca_runtime_error}\")") + endif () install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".") elseif (SLIC3R_FHS) # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share) diff --git a/build_win.bat b/build_win.bat index dfb30e313b..098d6fe1ff 100644 --- a/build_win.bat +++ b/build_win.bat @@ -282,11 +282,7 @@ if "%install_deps%" == "ON" ( call :note_failed "Visual Studio" !errorlevel! ) - REM CMake 4 dropped pre-3.5 policy support and ships incomplete ASM_ARMASM - REM linker modules, which breaks Boost.Context on ARM64. CI pins the same way. - set "cmake_version_flag=" - if /I "%arch%" == "ARM64" set "cmake_version_flag=--version 3.31.8" - call :print_and_run winget install !winget_args! --id=Kitware.CMake !cmake_version_flag! + call :print_and_run winget install !winget_args! --id=Kitware.CMake call :note_failed CMake !errorlevel! call :print_and_run winget install !winget_args! --id=StrawberryPerl.StrawberryPerl call :note_failed Perl !errorlevel! diff --git a/deps/OpenSSL/OpenSSL.cmake b/deps/OpenSSL/OpenSSL.cmake index 4a2d49572b..2bbf2b81b7 100644 --- a/deps/OpenSSL/OpenSSL.cmake +++ b/deps/OpenSSL/OpenSSL.cmake @@ -29,6 +29,15 @@ if(WIN32) # driven through nmake from a Ninja configure step. set(_conf_cmd ${CMAKE_COMMAND} -E env ${_openssl_msvc_env} perl Configure ) set(_cross_comp_prefix_line "") + if("${DEPS_ARCH}" STREQUAL "arm64") + # OpenSSL's VC configs pass /Gs0, which puts a __chkstk probe in every + # function. MSVC 14.51 and 14.52 (VS 2026) for ARM64 emit that call + # before the prologue saves LR, so the function returns into itself; + # in tls_parse_all_extensions that breaks every TLS handshake. 14.44 + # (VS 2022) is unaffected. Restore cl's default threshold: Configure + # appends /Gs4096 after /Gs0, and the later option wins. + set(_openssl_extra_cflags /Gs4096) + endif() set(_make_cmd ${CMAKE_COMMAND} -E env ${_openssl_msvc_env} nmake) set(_install_cmd ${CMAKE_COMMAND} -E env ${_openssl_msvc_env} nmake install_sw ) else() @@ -71,6 +80,7 @@ ExternalProject_Add(dep_OpenSSL # prefix stays single-layout. "--libdir=lib" ${_cross_comp_prefix_line} + ${_openssl_extra_cflags} no-shared no-asm no-ssl3-method diff --git a/resources/profiles/Snapmaker.json b/resources/profiles/Snapmaker.json index d13ed8bf21..4978095364 100644 --- a/resources/profiles/Snapmaker.json +++ b/resources/profiles/Snapmaker.json @@ -1,6 +1,6 @@ { "name": "Snapmaker", - "version": "02.04.00.16", + "version": "02.04.00.17", "force_update": "0", "description": "Snapmaker configurations", "machine_model_list": [ @@ -1448,6 +1448,10 @@ "name": "Snapmaker PETG HF @U1 0.2 nozzle", "sub_path": "filament/Snapmaker PETG HF @U1 0.2 nozzle.json" }, + { + "name": "Snapmaker PETG HF @U1 0.4 nozzle", + "sub_path": "filament/Snapmaker PETG HF @U1 0.4 nozzle.json" + }, { "name": "Snapmaker PETG HF @U1 0.6 nozzle", "sub_path": "filament/Snapmaker PETG HF @U1 0.6 nozzle.json" @@ -1920,6 +1924,122 @@ "name": "Snapmaker Breakaway Support For PLA @U1 0.8 nozzle", "sub_path": "filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json" }, + { + "name": "Generic PETG @U1 0.2 nozzle", + "sub_path": "filament/Generic PETG @U1 0.2 nozzle.json" + }, + { + "name": "Generic PETG @U1 0.4 nozzle", + "sub_path": "filament/Generic PETG @U1 0.4 nozzle.json" + }, + { + "name": "Generic PETG @U1 0.6 nozzle", + "sub_path": "filament/Generic PETG @U1 0.6 nozzle.json" + }, + { + "name": "Generic PETG @U1 0.8 nozzle", + "sub_path": "filament/Generic PETG @U1 0.8 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.2 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.2 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.4 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.4 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.6 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.6 nozzle.json" + }, + { + "name": "Generic PETG HF @U1 0.8 nozzle", + "sub_path": "filament/Generic PETG HF @U1 0.8 nozzle.json" + }, + { + "name": "Generic PETG-CF @U1 0.4 nozzle", + "sub_path": "filament/Generic PETG-CF @U1 0.4 nozzle.json" + }, + { + "name": "Generic PETG-CF @U1 0.6 nozzle", + "sub_path": "filament/Generic PETG-CF @U1 0.6 nozzle.json" + }, + { + "name": "Generic PETG-CF @U1 0.8 nozzle", + "sub_path": "filament/Generic PETG-CF @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.2 nozzle", + "sub_path": "filament/Generic PLA @U1 0.2 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.2 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.2 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA High Speed @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA High Speed @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.2 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.2 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA Silk @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA Silk @U1 0.8 nozzle.json" + }, + { + "name": "Generic PLA-CF @U1 0.4 nozzle", + "sub_path": "filament/Generic PLA-CF @U1 0.4 nozzle.json" + }, + { + "name": "Generic PLA-CF @U1 0.6 nozzle", + "sub_path": "filament/Generic PLA-CF @U1 0.6 nozzle.json" + }, + { + "name": "Generic PLA-CF @U1 0.8 nozzle", + "sub_path": "filament/Generic PLA-CF @U1 0.8 nozzle.json" + }, + { + "name": "Generic TPU @U1 0.4 nozzle", + "sub_path": "filament/Generic TPU @U1 0.4 nozzle.json" + }, + { + "name": "Generic TPU @U1 0.6 nozzle", + "sub_path": "filament/Generic TPU @U1 0.6 nozzle.json" + }, + { + "name": "Generic TPU @U1 0.8 nozzle", + "sub_path": "filament/Generic TPU @U1 0.8 nozzle.json" + }, { "name": "PolyTerra J1 PLA", "sub_path": "filament/Polymaker/PolyTerra J1 PLA.json" diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.2 nozzle.json new file mode 100644 index 0000000000..c834c68ac0 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.2 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "Iw7T4qqDf1fbSAa1", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "1" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.4 nozzle.json new file mode 100644 index 0000000000..e731e11e44 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.4 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "VHRa4TXU7HPz7Fld", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "12" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.6 nozzle.json new file mode 100644 index 0000000000..906aee7e15 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.6 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "Ubr8v7BTxiQMntVk", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "12" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.8 nozzle.json new file mode 100644 index 0000000000..8a5f1c8a0a --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG @U1 0.8 nozzle", + "inherits": "Generic PETG @System", + "from": "system", + "setting_id": "ro0mXCLzC5rY95oX", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "10", + "12" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.2 nozzle.json new file mode 100644 index 0000000000..abe817ca25 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.2 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.2 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "7yjLWAdcQe4ndo1z", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "1" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..344c1fa542 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.4 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "XWWLYZWkD9ZNRPeO", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "16" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.6 nozzle.json new file mode 100644 index 0000000000..a3b51268ac --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.6 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "1dj4JdFabSql3cEg", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "16" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.8 nozzle.json new file mode 100644 index 0000000000..7c7461a9f2 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG HF @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG HF @U1 0.8 nozzle", + "inherits": "Generic PETG HF @System", + "from": "system", + "setting_id": "1LYZ0KG5kQtaOOKt", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "20", + "16" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..6c7cbbed8e --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @U1 0.4 nozzle", + "inherits": "Generic PETG-CF @System", + "from": "system", + "setting_id": "wIKcBM1qLgzLEUJP", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "11.5", + "11" + ], + "fan_min_speed": [ + "5", + "5" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.6 nozzle.json new file mode 100644 index 0000000000..7802955968 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.6 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @U1 0.6 nozzle", + "inherits": "Generic PETG-CF @System", + "from": "system", + "setting_id": "FvrnBiPbjSvIF3kN", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "5", + "5" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.8 nozzle.json new file mode 100644 index 0000000000..651d9abe7c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PETG-CF @U1 0.8 nozzle.json @@ -0,0 +1,23 @@ +{ + "type": "filament", + "name": "Generic PETG-CF @U1 0.8 nozzle", + "inherits": "Generic PETG-CF @System", + "from": "system", + "setting_id": "SCfvzDgUWkFHmbtP", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "5", + "5" + ], + "fan_max_speed": [ + "40", + "40" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.2 nozzle.json new file mode 100644 index 0000000000..87bec786a4 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.2 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.2 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "8pb3tert1D4w0SKP", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "1.6" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.4 nozzle.json new file mode 100644 index 0000000000..2282b0d8c7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.4 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.4 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "Uilm8oVmZzyxE3ba", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.6 nozzle.json new file mode 100644 index 0000000000..d05642b524 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.6 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.6 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "aj4G9OSdgtQPqpkI", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.8 nozzle.json new file mode 100644 index 0000000000..c6b7968997 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA @U1 0.8 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA @U1 0.8 nozzle", + "inherits": "Generic PLA @System", + "from": "system", + "setting_id": "zom29gBgIZmvjFmh", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.2 nozzle.json new file mode 100644 index 0000000000..2de305bf14 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.2 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.2 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "rT8e5f81vwUpwPuq", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "2" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.4 nozzle.json new file mode 100644 index 0000000000..2f53c963c7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.4 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.4 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "ZUetX0WveqW8fy6f", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.6 nozzle.json new file mode 100644 index 0000000000..06975c412f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.6 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.6 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "y2WY6qLA3xKZM1Mm", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.8 nozzle.json new file mode 100644 index 0000000000..33912857cc --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA High Speed @U1 0.8 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA High Speed @U1 0.8 nozzle", + "inherits": "Generic PLA High Speed @System", + "from": "system", + "setting_id": "VwXJrdwxvzjlIGal", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "18", + "18" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.2 nozzle.json new file mode 100644 index 0000000000..659f7a2d4a --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.2 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.2 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "381SJIDBre8HxHy2", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.2 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "7.5", + "2" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.4 nozzle.json new file mode 100644 index 0000000000..a9492bae7e --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.4 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "Fd1g9OdeM3pUx8f5", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.6 nozzle.json new file mode 100644 index 0000000000..c55499d41c --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.6 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "8rhmpBFmMj9vVZwG", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.8 nozzle.json new file mode 100644 index 0000000000..29b5d871b7 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA Silk @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic PLA Silk @U1 0.8 nozzle", + "inherits": "Generic PLA Silk @System", + "from": "system", + "setting_id": "Fo7U7GYHZh1aZPLs", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..f4d72075d6 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.4 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @U1 0.4 nozzle", + "inherits": "Generic PLA-CF @System", + "from": "system", + "setting_id": "6AWubtDE4PqrKVNJ", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.6 nozzle.json new file mode 100644 index 0000000000..057abda7b0 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.6 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @U1 0.6 nozzle", + "inherits": "Generic PLA-CF @System", + "from": "system", + "setting_id": "AvM44HgMCkOCnmzY", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.8 nozzle.json new file mode 100644 index 0000000000..1b611ddc59 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic PLA-CF @U1 0.8 nozzle.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PLA-CF @U1 0.8 nozzle", + "inherits": "Generic PLA-CF @System", + "from": "system", + "setting_id": "tvYAUvQEbbdBCIg2", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "12" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.4 nozzle.json new file mode 100644 index 0000000000..c9aaf2c98f --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.4 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic TPU @U1 0.4 nozzle", + "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "9d0jRdMgkPMahYL7", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.6 nozzle.json new file mode 100644 index 0000000000..10e8559070 --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.6 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic TPU @U1 0.6 nozzle", + "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "LLjEPSU4l09N3Zb8", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.6 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.8 nozzle.json new file mode 100644 index 0000000000..1f96300f1d --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Generic TPU @U1 0.8 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "name": "Generic TPU @U1 0.8 nozzle", + "inherits": "Generic TPU @System", + "from": "system", + "setting_id": "Wfhd3jLEjSKzCeHE", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json index 0e743d7aee..5b0bf08517 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker General PLA Family @U1.json @@ -10,15 +10,18 @@ "Snapmaker U1 (0.4 nozzle)" ], "enable_pressure_advance": [ + "0", "0" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_vendor": [ "Polymaker" ], "nozzle_temperature_range_high": [ + "230", "230" ], "temperature_vitrification": [ @@ -29,5 +32,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json index 990cc483f3..efc5c7a792 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker Silk PLA Family @U1.json @@ -16,12 +16,15 @@ "Polymaker" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "nozzle_temperature_range_high": [ + "230", "230" ], "textured_plate_temp": [ @@ -29,5 +32,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json index 1dad000fb2..02a9306c72 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker Tough PLA Family @U1.json @@ -13,6 +13,7 @@ "1.23" ], "filament_flow_ratio": [ + "0.96", "0.96" ], "filament_vendor": [ @@ -29,5 +30,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json index b38925e01b..4dd43b5a54 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon ASA-CF08 @Snapmaker U1.json @@ -9,9 +9,27 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "10", + "10" + ], + "fan_max_speed": [ + "30", + "30" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json index 1bb569c291..e18e95a908 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA12-CF10 @Snapmaker U1.json @@ -9,18 +9,35 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retraction_length": [ + "1.0", "1.0" ], "filament_z_hop": [ + "0.0", "0.0" ], "enable_pressure_advance": [ + "1", "1" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "20", + "20" + ], + "fan_max_speed": [ + "50", + "50" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json index d6106faa50..453cfc22f5 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA6-CF20 @Snapmaker U1.json @@ -9,18 +9,35 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retraction_length": [ + "1.0", "1.0" ], "filament_z_hop": [ + "0.0", "0.0" ], "enable_pressure_advance": [ + "1", "1" ], "pressure_advance": [ + "0.08", "0.08" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json index 660f4e9ef2..e138910608 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PA612-ESD @Snapmaker U1.json @@ -9,16 +9,32 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retraction_length": [ + "1.0", "1.0" ], "filament_z_hop": [ + "0.0", "0.0" ], "description": " ", "enable_pressure_advance": [ + "1", "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json index 6e1797904c..c89f07d531 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PETG-ESD @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -18,6 +19,19 @@ "70" ], "pressure_advance": [ + "0.04", "0.04" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "10", + "10" + ], + "fan_max_speed": [ + "20", + "20" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json index 4f1a9fdc10..194b7ffee3 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Fiberon PPS-GF20 @Snapmaker U1.json @@ -9,7 +9,24 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], - "description": " " + "description": " ", + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "10", + "10" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json index 1ad0f0d820..247b2d5a83 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma CoPE @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json index dcd84aeba9..a572019ee0 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA @Snapmaker U1.json @@ -10,9 +10,27 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_wipe": [ + "0", "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json index 561c748be3..ab7c624d95 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Celestial @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json index fee27dc997..fed4023b6f 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Galaxy @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json index 2f1135de61..23a9dfc261 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Glow @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json index fd701bf8c3..ad27464abb 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Luminous @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json index 2a1dbab936..6f324f2e61 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Marble @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json index 7652606816..8ecdda93d1 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Matte @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json index fe8e68081c..25bb4078cf 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Metallic @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json index cf16cb95c9..60fee68897 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Neon @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json index eff77a2aa9..27591b4e6e 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Satin @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json index 1020a48f0a..1c3a47f2d5 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Silk @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json index 114391b517..8e0996b241 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Starlight @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json index ca50194577..d7df9c06be 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Temp Shift @Snapmaker U1.json @@ -10,18 +10,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "15", "15" ], "slow_down_layer_time": [ "4" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json index cff9ec2011..226456fd28 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA Translucent @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json index 1d4a6a0bbe..efa960062b 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Panchroma PLA UV Shift @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json index 836723cf7a..6dc86739c6 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite CosPLA @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json index f51cc5eeec..0ccb2e01c0 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -18,6 +19,19 @@ "70" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json index a3efeee371..cb8e6578dc 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PETG Translucent @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -18,6 +19,19 @@ "70" ], "pressure_advance": [ + "0.05", "0.05" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "40", + "40" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json index 715d8060e4..f2673a19f1 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json index e096b1b9b3..b5bfd95b09 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Galaxy @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json index a36d2b9de5..6e151ec544 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Glow @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json index 874004e6ea..dfd69a6b3e 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Luminous @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json index fbbb2a4585..35b02e2822 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Neon @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json index 47163a788c..ba2fec2e62 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro @Snapmaker U1.json @@ -10,18 +10,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "15", "15" ], "slow_down_layer_time": [ "4" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json index b1611b961d..5128f9ae12 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Pro Metallic @Snapmaker U1.json @@ -12,6 +12,7 @@ "; filament end gcode \n\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_start_gcode": [ @@ -25,6 +26,23 @@ "0" ], "enable_pressure_advance": [ + "0", + "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json index 56108cfed2..4a6a1d795b 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Starlight @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json index 799e272fab..4aece8be01 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyLite PLA Translucent @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json index 244cf91471..1b74452fea 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json index 19e419ca36..338081c3c6 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA Marble @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json index c3dd9d5537..d5584b2a0c 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/PolyTerra PLA+ @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json index ef631e550b..40282c676a 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json index ac49e4f7ac..3bb56f6d90 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker HT-PLA-GF @Snapmaker U1.json @@ -10,6 +10,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json index a3e11c2cd2..4352675193 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -16,5 +17,17 @@ ], "supertack_plate_temp_initial_layer": [ "70" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "50", + "50" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json index ecac971c5e..01508958df 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PETG Galaxy @Snapmaker U1.json @@ -9,6 +9,7 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "supertack_plate_temp": [ @@ -16,5 +17,17 @@ ], "supertack_plate_temp_initial_layer": [ "70" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "50", + "50" + ], + "fan_max_speed": [ + "10", + "10" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json index ff614bc79f..7563775a62 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA @Snapmaker U1.json @@ -9,12 +9,27 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "pressure_advance": [ + "0.05", "0.05" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json index d5823b53a6..93efc8ee96 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json index a26fb437e7..7ff4a36616 100644 --- a/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json +++ b/resources/profiles/Snapmaker/filament/Polymaker/Polymaker PLA Pro Metallic @Snapmaker U1.json @@ -9,6 +9,23 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json index fe6c59ba80..0609264bef 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS @U1.json @@ -9,6 +9,59 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_retract_length_toolchange": [ + "5", "5" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_z_hop_types": [ + "nil", + "Slope Lift" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "nozzle_temperature": [ + "260", + "280" + ], + "filament_max_volumetric_speed": [ + "8", + "22" + ], + "fan_max_speed": [ + "15", + "60" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ], + "filament_multitool_ramming_flow": [ + "10", + "30" + ], + "filament_minimal_purge_on_wipe_tower": [ + "0", + "15" + ], + "fan_min_speed": [ + "15", + "10" + ], + "filament_multitool_ramming_volume": [ + "0", + "5" + ], + "nozzle_temperature_initial_layer": [ + "260", + "280" + ], + "filament_retraction_length": [ + "0.6", + "0.2" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json index 1ba6c22c9a..7e8369a506 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ABS Benchy @U1.json @@ -22,33 +22,43 @@ "2" ], "filament_deretraction_speed": [ + "55", "55" ], "filament_max_volumetric_speed": [ + "31", "31" ], "filament_retract_when_changing_layer": [ + "0", "0" ], "filament_retraction_length": [ + "0.5", "0.5" ], "filament_z_hop": [ + "0", "0" ], "filament_retraction_speed": [ + "55", "55" ], "filament_wipe": [ + "0", "0" ], "nozzle_temperature": [ + "250", "250" ], "fan_max_speed": [ + "50", "50" ], "fan_min_speed": [ + "35", "35" ], "slow_down_min_speed": [ @@ -59,5 +69,9 @@ ], "default_filament_colour": [ "" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json index 67bde29e8d..b63dd9d5f7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker ASA @U1.json @@ -9,6 +9,59 @@ "Snapmaker U1 (0.4 nozzle)" ], "filament_retract_length_toolchange": [ + "5", "5" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_z_hop_types": [ + "nil", + "Slope Lift" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "nozzle_temperature": [ + "255", + "280" + ], + "filament_max_volumetric_speed": [ + "8", + "22" + ], + "fan_max_speed": [ + "15", + "25" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ], + "pressure_advance": [ + "0.04", + "0.02" + ], + "filament_multitool_ramming_flow": [ + "10", + "20" + ], + "filament_minimal_purge_on_wipe_tower": [ + "0", + "15" + ], + "fan_min_speed": [ + "0", + "10" + ], + "filament_multitool_ramming_volume": [ + "0", + "10" + ], + "nozzle_temperature_initial_layer": [ + "255", + "280" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json index 19dc66df4e..eea348becc 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.2 nozzle.json @@ -13,24 +13,30 @@ "PLA" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "30", "30" ], "fan_min_speed": [ + "20", "20" ], "filament_cost": [ @@ -40,36 +46,46 @@ "1.3" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1", "1" ], "filament_max_volumetric_speed": [ + "0.5", "0.5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "240", "240" ], "nozzle_temperature_initial_layer": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.2", "0.2" ], "textured_plate_temp": [ @@ -85,15 +101,19 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -101,5 +121,9 @@ ], "filament_unloading_speed_start": [ "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json index 6f800f7b98..495ef711ac 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.6 nozzle.json @@ -13,6 +13,7 @@ "PLA" ], "enable_pressure_advance": [ + "0", "0" ], "filament_cost": [ @@ -22,21 +23,26 @@ "1.3" ], "filament_flow_ratio": [ + "0.95", "0.95" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", "210" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.02", "0.02" ], "textured_plate_temp": [ @@ -46,36 +52,46 @@ "65" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_wipe_distance": [ + "2", "2" ], "filament_cooling_moves": [ @@ -85,15 +101,19 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -101,5 +121,13 @@ ], "filament_unloading_speed_start": [ "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json index c7a2b01351..cc7fcde0f6 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1 0.8 nozzle.json @@ -13,18 +13,22 @@ "PLA" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ @@ -34,33 +38,42 @@ "1.3" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "0.93", "0.93" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "3", "3" ], "filament_retraction_speed": [ + "nil", "nil" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", "210" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.015", "0.015" ], "textured_plate_temp_initial_layer": [ @@ -73,15 +86,19 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -91,9 +108,18 @@ "100" ], "fan_min_speed": [ + "100", "100" ], "textured_plate_temp": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json index eff74ae5ab..b574fbeb38 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker Breakaway Support For PLA @U1.json @@ -13,54 +13,68 @@ "PLA" ], "enable_pressure_advance": [ + "1", "1" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_moves": [ "4" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1", "1" ], "filament_loading_speed": [ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -73,15 +87,19 @@ "65" ], "nozzle_temperature": [ + "210", "210" ], "nozzle_temperature_initial_layer": [ + "210", "210" ], "nozzle_temperature_range_low": [ + "190", "190" ], "pressure_advance": [ + "0.03", "0.03" ], "textured_plate_temp": [ @@ -89,5 +107,17 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "12", + "18" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json index b2dc562d3b..3d1965e97e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PA-CF @U1.json @@ -7,5 +7,17 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "15", + "15" + ], + "fan_max_speed": [ + "50", + "50" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json index e4dd0d2035..08beba6a2e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PET @U1.json @@ -7,5 +7,17 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "26", + "26" + ], + "fan_max_speed": [ + "50", + "50" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json index 5df9952064..f2377ee1e4 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG @U1.json @@ -7,5 +7,17 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "0", + "0" + ], + "fan_max_speed": [ + "20", + "20" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json index 9d9e3918cf..f88a4747ed 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.2 nozzle.json @@ -6,24 +6,30 @@ "setting_id": "Ujul2YTBwfldFiFd", "instantiation": "true", "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_max_volumetric_speed": [ - "1" + "1", + "2" ], "filament_ramming_travel_time": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" ], "additional_cooling_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -36,27 +42,34 @@ "20" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "30", "30" ], "filament_end_gcode": [ "\n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "3", "3" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1.5", "1.5" ], "filament_start_gcode": [ @@ -72,12 +85,15 @@ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ - "245" + "245", + "230" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_speed": [ @@ -102,6 +118,15 @@ "80" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" + ], + "pressure_advance": [ + "0.03", + "0.0525" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.4 nozzle.json new file mode 100644 index 0000000000..0a0f9726ff --- /dev/null +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.4 nozzle.json @@ -0,0 +1,91 @@ +{ + "type": "filament", + "name": "Snapmaker PETG HF @U1 0.4 nozzle", + "inherits": "Snapmaker PETG HF @U1 base2", + "from": "system", + "setting_id": "9NnYt52azW8zCp4a", + "instantiation": "true", + "compatible_printers": [ + "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15", + "50" + ], + "nozzle_temperature_range_low": [ + "220", + "230" + ], + "fan_max_speed": [ + "40", + "60" + ], + "nozzle_temperature_initial_layer": [ + "220", + "230" + ], + "nozzle_temperature": [ + "220", + "245" + ], + "filament_multitool_ramming_volume": [ + "0", + "8" + ], + "filament_retraction_length": [ + "nil", + "0.8" + ], + "filament_wipe_distance": [ + "nil", + "1" + ], + "filament_max_volumetric_speed": [ + "16", + "30" + ], + "filament_retract_length_toolchange": [ + "nil", + "8" + ], + "pressure_advance": [ + "0.03", + "0.035" + ], + "filament_deretraction_speed": [ + "nil", + "40" + ], + "filament_multitool_ramming_flow": [ + "10", + "30" + ], + "fan_min_speed": [ + "20", + "30" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" + ], + "filament_z_hop_types": [ + "nil", + "Slope Lift" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "filament_retraction_speed": [ + "nil", + "40" + ], + "additional_cooling_fan_speed": [ + "0", + "0" + ] +} diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json index 985505a027..d5c2396111 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.6 nozzle.json @@ -6,21 +6,26 @@ "setting_id": "2FfQZdp5xunngnF0", "instantiation": "true", "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_ramming_travel_time": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "compatible_printers": [ "Snapmaker U1 (0.6 nozzle)" ], "additional_cooling_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -33,30 +38,38 @@ "20" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "30", "30" ], "filament_end_gcode": [ "\n" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "2.5", "2.5" ], "filament_start_gcode": [ @@ -66,12 +79,15 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ @@ -81,12 +97,15 @@ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ - "245" + "245", + "230" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_speed": [ @@ -109,5 +128,13 @@ ], "textured_plate_temp_initial_layer": [ "80" + ], + "pressure_advance": [ + "0.03", + "0.0525" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json index 83c1b17971..4f32268465 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG HF @U1 0.8 nozzle.json @@ -6,21 +6,26 @@ "setting_id": "ebANa67V4B2nwUaX", "instantiation": "true", "filament_extruder_variant": [ - "Direct Drive Standard" + "Direct Drive Standard", + "Direct Drive High Flow" ], "filament_ramming_travel_time": [ + "0", "0" ], "long_retractions_when_ec": [ + "0", "0" ], "retraction_distances_when_ec": [ + "0", "0" ], "compatible_printers": [ "Snapmaker U1 (0.8 nozzle)" ], "additional_cooling_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -33,27 +38,35 @@ "20" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "30", "30" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1", "1" ], "filament_start_gcode": [ @@ -63,12 +76,15 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "2", "2" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ @@ -78,12 +94,15 @@ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ - "245" + "245", + "230" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_speed": [ @@ -106,5 +125,13 @@ ], "textured_plate_temp_initial_layer": [ "80" + ], + "pressure_advance": [ + "0.03", + "0.0525" + ], + "filament_flow_ratio": [ + "0.95", + "0.955" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json index ee6234f406..2f19d94258 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.2 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.2 nozzle)" ], "additional_cooling_fan_speed": [ + "20", "20" ], "close_fan_the_first_x_layers": [ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "40", "40" ], "fan_min_speed": [ + "20", "20" ], "filament_cooling_moves": [ @@ -36,36 +41,46 @@ "1.25" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_loading_speed": [ "28" ], "filament_max_volumetric_speed": [ + "1", "1" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "50", "50" ], "filament_unloading_speed": [ @@ -75,25 +90,30 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.23" + "0.23", + "0.2875" ], "slow_down_min_speed": [ "10" @@ -105,6 +125,11 @@ "80" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json index e0e60a0e14..68d2f876b7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.4 nozzle.json @@ -12,15 +12,19 @@ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "30", "30" ], "fan_min_speed": [ + "10", "10" ], "filament_cooling_moves": [ @@ -30,30 +34,38 @@ "24.99" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_loading_speed": [ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -63,25 +75,30 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "250", "250" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.04" + "0.04", + "0.05" ], "slow_down_min_speed": [ "10" @@ -94,5 +111,13 @@ ], "filament_density": [ "1.25" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "0", + "0" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json index 14f59104f8..7ce482d10f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.6 nozzle.json @@ -12,15 +12,19 @@ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "20", "20" ], "filament_cost": [ @@ -30,28 +34,34 @@ "1.25" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "16", "16" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.02" + "0.02", + "0.025" ], "slow_down_min_speed": [ "10" @@ -69,24 +79,31 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_minimum_travel": [ + "1", "1" ], "filament_unloading_speed": [ @@ -96,12 +113,19 @@ "100" ], "filament_wipe_distance": [ + "2", "2" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json index e746141f06..4c4773cb91 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 0.8 nozzle.json @@ -12,15 +12,19 @@ "3" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_max_speed": [ + "60", "60" ], "fan_min_speed": [ + "20", "20" ], "filament_cost": [ @@ -30,28 +34,34 @@ "1.25" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_max_volumetric_speed": [ + "16", "16" ], "hot_plate_temp": [ "80" ], "nozzle_temperature": [ + "245", "245" ], "nozzle_temperature_initial_layer": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "230", "230" ], "overhang_fan_threshold": [ "10%" ], "pressure_advance": [ - "0.02" + "0.02", + "0.025" ], "slow_down_min_speed": [ "10" @@ -69,24 +79,31 @@ "28" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -96,9 +113,15 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json index f0bae32788..f8966e8633 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1.json @@ -7,5 +7,77 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_multitool_ramming": [ + "0", + "1" + ], + "nozzle_temperature": [ + "245", + "260" + ], + "filament_max_volumetric_speed": [ + "6.4", + "18" + ], + "fan_max_speed": [ + "20", + "40" + ], + "additional_cooling_fan_speed": [ + "0", + "20" + ], + "pressure_advance": [ + "0.03", + "0.028" + ], + "filament_multitool_ramming_flow": [ + "10", + "13" + ], + "filament_minimal_purge_on_wipe_tower": [ + "0", + "30" + ], + "nozzle_temperature_range_high": [ + "255", + "270" + ], + "nozzle_temperature_range_low": [ + "220", + "240" + ], + "filament_flow_ratio": [ + "0.95", + "1.01" + ], + "fan_min_speed": [ + "0", + "5" + ], + "filament_multitool_ramming_volume": [ + "0", + "0.5" + ], + "nozzle_temperature_initial_layer": [ + "250", + "260" + ], + "filament_retract_length_toolchange": [ + "nil", + "nil" + ], + "enable_pressure_advance": [ + "0", + "1" + ], + "filament_retraction_length": [ + "nil", + "0.6" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json index 1a2f9e3ff3..42abd9b5f5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA @U1.json @@ -13,5 +13,21 @@ ], "hot_plate_temp_initial_layer": [ "55" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json index 4b68672fa5..040cfbe850 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Basic @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,12 +58,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,6 +284,7 @@ "0.4157" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json index fadf7e59d2..37ecf39eab 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1.json @@ -7,5 +7,21 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json index 219e8075e5..ef95d9b0e7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Full Spectrum @U1 0.4 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -52,13 +59,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -70,9 +79,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -91,6 +102,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -100,6 +112,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -112,21 +125,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -136,36 +155,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ - "10" + "10", + "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ - "nil" + "nil", + "0.5" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -202,16 +232,20 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ - "nil" + "nil", + "Slope Lift" ], "full_fan_speed_layer": [ "0" @@ -226,15 +260,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -247,7 +285,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -281,5 +320,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json index 907781cd2c..9ea0ac1b29 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 0.4 nozzle.json @@ -9,12 +9,15 @@ "Snapmaker U1 (0.4 nozzle)" ], "additional_cooling_fan_speed": [ - "80" + "80", + "100" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cooling_final_speed": [ @@ -30,7 +33,8 @@ "20" ], "filament_flow_ratio": [ - "0.97" + "0.97", + "0.98" ], "filament_loading_speed": [ "28" @@ -39,27 +43,35 @@ "3" ], "filament_max_volumetric_speed": [ - "16" + "16", + "18" ], "filament_minimal_purge_on_wipe_tower": [ + "30", "30" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -69,9 +81,11 @@ "100" ], "filament_z_hop": [ + "0.2", "0.2" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp_initial_layer": [ @@ -91,5 +105,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "pressure_advance": [ + "0.02", + "0.023" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json index d2c9dddefb..baad41bb2f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Lite @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -54,12 +61,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "1", "1" ], "eng_plate_temp": [ @@ -72,9 +81,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -93,6 +104,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -102,6 +114,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -114,21 +127,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "15", "15" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -138,33 +157,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +230,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -225,15 +258,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,6 +283,7 @@ "0.4157" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ @@ -280,5 +318,9 @@ ], "textured_plate_temp_initial_layer": [ "60" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json index 2a8c1e40c3..9b4a418dda 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.2 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.2 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "chamber_temperature": [ @@ -36,6 +41,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +57,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "45" @@ -69,9 +77,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -90,9 +100,11 @@ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_notes": [ @@ -102,33 +114,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "2", "2" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_shrink": [ @@ -156,12 +178,15 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -171,9 +196,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -213,6 +240,7 @@ "40" ], "filament_max_volumetric_speed": [ + "2", "2" ], "hot_plate_temp": [ @@ -228,6 +256,7 @@ "65" ], "additional_cooling_fan_speed": [ + "80", "80" ], "filament_cooling_final_speed": [ @@ -240,10 +269,12 @@ "2" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ - "1.05" + "1.05", + "1.0395" ], "filament_loading_speed": [ "10" @@ -252,15 +283,19 @@ "50" ], "filament_minimal_purge_on_wipe_tower": [ + "5", "5" ], "filament_multitool_ramming_flow": [ + "4", "4" ], "filament_multitool_ramming_volume": [ + "4", "4" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_stamping_distance": [ @@ -273,15 +308,23 @@ "100" ], "filament_z_hop_types": [ + "nil", "nil" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "pressure_advance": [ - "0.025" + "0.025", + "0.03" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json index 9de7615ae5..28ebc09582 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.6 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.6 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "chamber_temperature": [ @@ -36,6 +41,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +57,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "45" @@ -69,9 +77,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -81,6 +91,7 @@ "1.26" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -93,15 +104,19 @@ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_notes": [ @@ -111,33 +126,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -165,15 +190,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -183,9 +212,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -231,6 +262,7 @@ "45" ], "additional_cooling_fan_speed": [ + "80", "80" ], "filament_cooling_final_speed": [ @@ -243,7 +275,8 @@ "2" ], "filament_flow_ratio": [ - "0.99" + "0.99", + "0.9801" ], "filament_loading_speed": [ "10" @@ -252,12 +285,15 @@ "50" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retraction_length": [ + "0.6", "0.6" ], "filament_stamping_distance": [ @@ -276,12 +312,19 @@ "65" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "pressure_advance": [ - "0.015" + "0.015", + "0.018" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json index 251b2a47b6..89d36b18ae 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1 0.8 nozzle.json @@ -9,21 +9,26 @@ "Snapmaker U1 (0.8 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "chamber_temperature": [ @@ -36,6 +41,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +57,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "45" @@ -69,9 +77,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -87,21 +97,26 @@ " " ], "filament_flow_ratio": [ - "0.98" + "0.98", + "0.9702" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_notes": [ @@ -111,30 +126,39 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_shrink": [ @@ -162,15 +186,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "full_fan_speed_layer": [ @@ -180,9 +208,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -222,7 +252,8 @@ "40" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "textured_plate_temp": [ "65" @@ -231,6 +262,7 @@ "65" ], "additional_cooling_fan_speed": [ + "80", "80" ], "filament_cooling_final_speed": [ @@ -243,6 +275,7 @@ "2" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_loading_speed": [ @@ -252,15 +285,19 @@ "50" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retraction_length": [ + "0.6", "0.6" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_stamping_distance": [ @@ -279,9 +316,15 @@ "65" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "pressure_advance": [ - "0.015" + "0.015", + "0.018" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json index badf918d97..a017bcc49d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Matte @U1.json @@ -10,25 +10,31 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ - "80" + "80", + "100" ], "chamber_temperature": [ "0" @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -52,13 +59,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -70,9 +79,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -91,6 +102,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -100,7 +112,8 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ - "1" + "1", + "0.99" ], "filament_is_support": [ "0" @@ -112,21 +125,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ - "22" + "22", + "40" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -136,36 +155,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ - "nil" + "nil", + "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -202,16 +232,20 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ - "nil" + "nil", + "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ - "nil" + "nil", + "Slope Lift" ], "full_fan_speed_layer": [ "0" @@ -226,15 +260,19 @@ "0" ], "nozzle_temperature": [ - "215" + "215", + "220" ], "nozzle_temperature_initial_layer": [ - "215" + "215", + "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -247,7 +285,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -281,5 +320,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json index 538158a155..9f52235909 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1.json @@ -7,5 +7,21 @@ "instantiation": "true", "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json index e4fdb8016b..6d2653c296 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.2 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.2 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "1.02", "1.02" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "3", "3" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,15 +197,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ + "2", "2" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json index b144ce86dd..740b873a76 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.6 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.6 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,15 +197,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ + "10", "10" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json index aa92e97d18..f01e50b46e 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1 0.8 nozzle.json @@ -10,24 +10,30 @@ "Snapmaker U1 (0.8 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,15 +197,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ + "10", "10" ], "filament_retraction_length": [ + "0.4", "0.4" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json index 6b6030b919..f806f4325b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Silk @U1.json @@ -10,25 +10,31 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ - "70" + "70", + "80" ], "chamber_temperature": [ "0" @@ -40,6 +46,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -49,12 +56,14 @@ "60" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -67,9 +76,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ @@ -79,6 +90,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -88,24 +100,30 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ "0" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -115,33 +133,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -169,16 +197,20 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ - "nil" + "nil", + "Slope Lift" ], "full_fan_speed_layer": [ "0" @@ -187,9 +219,11 @@ "0" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -253,9 +287,11 @@ "3" ], "filament_max_volumetric_speed": [ - "10" + "10", + "12" ], "filament_retraction_length": [ + "0.2", "0.2" ], "filament_stamping_distance": [ @@ -274,12 +310,19 @@ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "pressure_advance": [ + "0.015", "0.015" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json index 7fcb20f31b..22173ad1f3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.2 nozzle.json @@ -6,24 +6,31 @@ "setting_id": "jsAgNNiUC6DoO7rz", "instantiation": "true", "filament_deretraction_speed": [ + "30", "30" ], "filament_flow_ratio": [ + "1.01", "1.01" ], "filament_max_volumetric_speed": [ + "2", "2" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_speed": [ + "30", "30" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp": [ @@ -33,7 +40,8 @@ "65" ], "pressure_advance": [ - "0.2" + "0.2", + "0.24" ], "textured_plate_temp": [ "65" @@ -45,6 +53,23 @@ "Snapmaker U1 (0.2 nozzle)" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json index 18fca8b4fd..19dadb2735 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.6 nozzle.json @@ -9,24 +9,31 @@ "Snapmaker U1 (0.6 nozzle)" ], "filament_deretraction_speed": [ + "30", "30" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1.6", "1.6" ], "filament_retraction_speed": [ + "30", "30" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "textured_plate_temp": [ @@ -36,6 +43,27 @@ "65" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "pressure_advance": [ + "0.02", + "0.024" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json index 2ebadbd2b2..baf38623e5 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1 0.8 nozzle.json @@ -9,25 +9,32 @@ "Snapmaker U1 (0.8 nozzle)" ], "filament_deretraction_speed": [ + "30", "30" ], "filament_multitool_ramming_flow": [ + "30", "30" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "1.6", "1.6" ], "filament_retraction_speed": [ + "30", "30" ], "nozzle_temperature": [ + "215", "215" ], "pressure_advance": [ - "0.018" + "0.018", + "0.0216" ], "textured_plate_temp": [ "65" @@ -36,6 +43,23 @@ "65" ], "enable_pressure_advance": [ - "0" + "0", + "1" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json index 2525f5b2a9..0bc5a58986 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA SnapSpeed @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.24" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.966", "0.966" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "50" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ - "20" + "20", + "40" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ - "30" + "30", + "40" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "0.4", "0.4" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json index 6271b7af42..e13c5b5c00 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.2 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.2 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.22" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "1.02", "1.02" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "1.6", "1.6" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "0%", "0%" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "0.2", "0.2" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "1", "1" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.15" + "0.15", + "0.18" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json index 7d4270ef31..64cb69bab3 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.4 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,12 +58,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "1", "1" ], "eng_plate_temp": [ @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.32" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_minimal_purge_on_wipe_tower": [ + "50", "50" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "0.2", "0.2" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "190", "190" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json index af3f95c757..8e0c82abc7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.6 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.6 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.22" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "0%", "0%" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "0.5", "0.5" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "50", "50" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json index a10a4b2fb1..3e92a6af2f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Translucent @U1 0.8 nozzle.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.8 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "100", "100" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -51,13 +58,15 @@ "0" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "eng_plate_temp": [ "60" @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.22" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "0.95", "0.95" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_notes": [ @@ -135,36 +154,47 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "0%", "0%" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_shrink": [ @@ -201,15 +231,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "full_fan_speed_layer": [ @@ -225,15 +259,19 @@ "0" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "nozzle_temperature_range_high": [ + "240", "240" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -246,7 +284,8 @@ "0.4157" ], "pressure_advance": [ - "0.02" + "0.02", + "0.024" ], "reduce_fan_stop_start_freq": [ "1" @@ -280,5 +319,9 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json index 283d5876b7..9841b17c95 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.4 nozzle.json @@ -13,15 +13,18 @@ "" ], "enable_pressure_advance": [ + "1", "1" ], "filament_end_gcode": [ "\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_vendor": [ @@ -40,36 +43,45 @@ "65" ], "filament_flow_ratio": [ + "0.97", "0.97" ], "filament_max_volumetric_speed": [ - "18" + "18", + "20" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ - "5" + "5", + "6" ], "filament_retraction_length": [ + "0.6", "0.6" ], "pressure_advance": [ - "0.025" + "0.025", + "0.024" ], "slow_down_layer_time": [ "4" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -79,21 +91,26 @@ "35" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "nozzle_temperature": [ + "220", "220" ], "overhang_fan_threshold": [ @@ -104,5 +121,25 @@ ], "temperature_vitrification": [ "45" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_z_hop_types": [ + "nil", + "Auto Lift" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json index 09555457d5..f5fbcfba3a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.6 nozzle.json @@ -13,15 +13,18 @@ "" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_vendor": [ @@ -40,42 +43,53 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "18", "18" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "0.4", "0.4" ], "pressure_advance": [ - "0.014" + "0.014", + "0.0134" ], "slow_down_layer_time": [ "4" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -85,21 +99,26 @@ "35" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "nozzle_temperature": [ + "220", "220" ], "overhang_fan_threshold": [ @@ -110,5 +129,17 @@ ], "temperature_vitrification": [ "45" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json index 4a5a04a5ee..e36e72e878 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA Wood @U1 0.8 nozzle.json @@ -13,15 +13,18 @@ "" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "\n" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_vendor": [ @@ -40,42 +43,53 @@ "65" ], "filament_flow_ratio": [ + "0.965", "0.965" ], "filament_max_volumetric_speed": [ + "20", "20" ], "filament_multitool_ramming_flow": [ + "40", "40" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "5", "5" ], "filament_retraction_length": [ + "0.4", "0.4" ], "pressure_advance": [ - "0.007" + "0.007", + "0.0067" ], "slow_down_layer_time": [ "4" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -85,21 +99,26 @@ "35" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "nozzle_temperature": [ + "220", "220" ], "overhang_fan_threshold": [ @@ -110,5 +129,17 @@ ], "temperature_vitrification": [ "45" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json index 357c5de50a..b375be63da 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.4 nozzle.json @@ -11,16 +11,19 @@ "Snapmaker U1 (0.4 nozzle)" ], "enable_pressure_advance": [ + "1", "1" ], "filament_end_gcode": [ "" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ - "20" + "20", + "30" ], "filament_start_gcode": [ "" @@ -41,54 +44,69 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ - "15" + "15", + "20" ], "filament_minimal_purge_on_wipe_tower": [ + "50", "50" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ - "5" + "5", + "15" ], "filament_retraction_length": [ - "1" + "1", + "0.8" ], "filament_type": [ "PLA-CF" ], "filament_z_hop": [ + "0.4", "0.4" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "nozzle_temperature": [ - "240" + "240", + "230" ], "nozzle_temperature_initial_layer": [ - "240" + "240", + "230" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "200", "200" ], "pressure_advance": [ - "0.01" + "0.01", + "0.02" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -98,18 +116,22 @@ "45" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "overhang_fan_threshold": [ @@ -128,6 +150,19 @@ "45" ], "additional_cooling_fan_speed": [ - "0" + "0", + "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json index 6f09ea5d6a..9f478e88ef 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.6 nozzle.json @@ -10,15 +10,18 @@ "Snapmaker U1 (0.6 nozzle)" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_start_gcode": [ @@ -40,46 +43,59 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "18", "18" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "2", "2" ], "filament_type": [ "PLA-CF" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "nozzle_temperature": [ - "220" + "220", + "210" ], "nozzle_temperature_initial_layer": [ - "220" + "220", + "210" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "210", "210" ], "pressure_advance": [ - "0.015" + "0.015", + "0.03" ], "filament_cost": [ "35" @@ -91,15 +107,18 @@ "8" ], "filament_wipe_distance": [ + "2", "2" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -109,15 +128,19 @@ "45" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "overhang_fan_threshold": [ @@ -133,6 +156,19 @@ "45" ], "additional_cooling_fan_speed": [ + "0", "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json index 564e59e1a9..25dbb6746a 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PLA-CF @U1 0.8 nozzle.json @@ -10,15 +10,18 @@ "Snapmaker U1 (0.8 nozzle)" ], "enable_pressure_advance": [ - "0" + "0", + "1" ], "filament_end_gcode": [ "" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "25", "25" ], "filament_start_gcode": [ @@ -40,46 +43,59 @@ "65" ], "filament_flow_ratio": [ + "0.98", "0.98" ], "filament_max_volumetric_speed": [ + "18", "18" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "3", "3" ], "filament_type": [ "PLA-CF" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "nozzle_temperature": [ - "220" + "220", + "210" ], "nozzle_temperature_initial_layer": [ - "220" + "220", + "210" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "210", "210" ], "pressure_advance": [ - "0.015" + "0.015", + "0.03" ], "filament_cost": [ "35" @@ -91,12 +107,14 @@ "8" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -106,15 +124,19 @@ "45" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "overhang_fan_threshold": [ @@ -130,6 +152,19 @@ "45" ], "additional_cooling_fan_speed": [ + "0", "0" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "100", + "100" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json index b28e0627ad..afd8ebbc2c 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.6 nozzle.json @@ -9,60 +9,75 @@ "Snapmaker U1 (0.6 nozzle)" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "filament_cost": [ "79.98" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ - "0.98" + "0.98", + "0.9506" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_minimum_travel": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_soluble": [ "1" ], "filament_wipe_distance": [ + "2", "2" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "nozzle_temperature_range_low": [ + "210", "210" ], "pressure_advance": [ + "0.03", "0.03" ], "slow_down_layer_time": [ @@ -90,15 +105,19 @@ "3" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -108,6 +127,15 @@ "100" ], "fan_min_speed": [ + "100", + "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json index 6572a60078..5b61a78cb7 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 0.8 nozzle.json @@ -9,39 +9,49 @@ "Snapmaker U1 (0.8 nozzle)" ], "enable_pressure_advance": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "79.98" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ - "0.96" + "0.96", + "0.9312" ], "filament_retract_length_toolchange": [ + "10", "10" ], "filament_retraction_length": [ + "nil", "nil" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_soluble": [ @@ -51,15 +61,19 @@ "65" ], "nozzle_temperature": [ + "225", "225" ], "nozzle_temperature_initial_layer": [ + "225", "225" ], "nozzle_temperature_range_low": [ + "205", "205" ], "pressure_advance": [ + "0.03", "0.03" ], "slow_down_layer_time": [ @@ -87,15 +101,19 @@ "3" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_flow": [ + "20", "20" ], "filament_multitool_ramming_volume": [ + "5", "5" ], "filament_unloading_speed": [ @@ -103,5 +121,13 @@ ], "filament_unloading_speed_start": [ "100" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json index 5ed5d243ac..72ae9bb87d 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker PVA @U1.json @@ -9,27 +9,34 @@ "Snapmaker U1 (0.4 nozzle)" ], "enable_pressure_advance": [ + "1", "1" ], "nozzle_temperature_range_high": [ + "240", "240" ], "pressure_advance": [ + "0.03", "0.03" ], "additional_cooling_fan_speed": [ + "70", "70" ], "close_fan_the_first_x_layers": [ "1" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "fan_min_speed": [ + "100", "100" ], "filament_cooling_final_speed": [ @@ -42,6 +49,7 @@ "4" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_loading_speed": [ @@ -51,24 +59,31 @@ "3" ], "filament_max_volumetric_speed": [ - "5" + "5", + "6" ], "filament_minimal_purge_on_wipe_tower": [ + "20", "20" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "filament_retract_length_toolchange": [ + "4", "4" ], "filament_retraction_length": [ - "0.4" + "0.4", + "0.6" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_unloading_speed": [ @@ -78,15 +93,18 @@ "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "hot_plate_temp_initial_layer": [ "65" ], "nozzle_temperature": [ + "240", "240" ], "nozzle_temperature_initial_layer": [ + "240", "240" ], "slow_down_layer_time": [ @@ -97,5 +115,21 @@ ], "textured_plate_temp_initial_layer": [ "65" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_multitool_ramming_flow": [ + "10", + "10" + ], + "filament_flow_ratio": [ + "1", + "0.97" + ], + "fan_max_speed": [ + "100", + "100" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json index a4214b6cd0..5f6820fa39 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json @@ -19,18 +19,22 @@ "65" ], "filament_flow_ratio": [ + "1.1", "1.1" ], "filament_density": [ "1.22" ], "filament_max_volumetric_speed": [ + "7.2", "7.2" ], "fan_max_speed": [ + "65", "65" ], "fan_min_speed": [ + "65", "65" ], "default_filament_colour": [ @@ -38,5 +42,13 @@ ], "filament_notes": [ "eSUN eLastic TPE-83A\n" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json index afb529e983..d065dddacd 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.6 nozzle.json @@ -7,6 +7,7 @@ "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ + "3.2", "3.2" ], "compatible_printers": [ @@ -19,69 +20,89 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "pressure_advance": [ + "0.02", "0.02" ], "additional_cooling_fan_speed": [ + "100", "100" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_pressure_advance": [ + "0", "0" ], "filament_deretraction_speed": [ + "20", "20" ], "filament_flow_ratio": [ + "1.093", "1.093" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "4", "4" ], "filament_retraction_length": [ + "0.6", "0.6" ], "filament_retraction_speed": [ + "20", "20" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "slow_down_layer_time": [ "14" ], "nozzle_temperature_range_high": [ + "240", "240" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "filament_wipe": [ + "1", "1" ], "filament_wipe_distance": [ + "0", "0" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ @@ -100,27 +121,34 @@ "30" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -145,6 +173,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json index 8cf3452469..e2b0e51f4f 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1 0.8 nozzle.json @@ -7,6 +7,7 @@ "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ + "3.5", "3.5" ], "compatible_printers": [ @@ -19,63 +20,81 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "pressure_advance": [ + "0.02", "0.02" ], "additional_cooling_fan_speed": [ + "70", "70" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "enable_pressure_advance": [ + "0", "0" ], "filament_deretraction_speed": [ + "20", "20" ], "filament_flow_ratio": [ + "1.095", "1.095" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "4", "4" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_speed": [ + "20", "20" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "220", "220" ], "nozzle_temperature_initial_layer": [ + "220", "220" ], "slow_down_layer_time": [ "14" ], "nozzle_temperature_range_high": [ + "240", "240" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ @@ -94,27 +113,34 @@ "30" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -139,6 +165,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json index 8f6ba9663f..2fc438f976 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 90A @U1.json @@ -7,6 +7,7 @@ "filament_id": "OFY7jxcS", "instantiation": "true", "filament_max_volumetric_speed": [ + "3.2", "3.2" ], "compatible_printers": [ @@ -19,57 +20,73 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "pressure_advance": [ + "0.4", "0.4" ], "additional_cooling_fan_speed": [ + "100", "100" ], "complete_print_exhaust_fan_speed": [ + "100", "100" ], "during_print_exhaust_fan_speed": [ + "100", "100" ], "enable_pressure_advance": [ + "0", "0" ], "filament_deretraction_speed": [ + "15", "15" ], "filament_flow_ratio": [ + "1.045", "1.045" ], "filament_multitool_ramming_flow": [ + "5", "5" ], "filament_retract_length_toolchange": [ + "2", "2" ], "filament_retraction_length": [ + "1.2", "1.2" ], "filament_retraction_speed": [ + "15", "15" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "slow_down_layer_time": [ "14" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ @@ -88,30 +105,38 @@ "30" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_cost": [ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -136,6 +161,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json index 59b125ff72..6d5c2c4c73 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json @@ -9,24 +9,30 @@ "Snapmaker U1 (0.4 nozzle)" ], "activate_air_filtration": [ + "0", "0" ], "activate_chamber_temp_control": [ "0" ], "adaptive_pressure_advance": [ + "0", "0" ], "adaptive_pressure_advance_bridges": [ + "0", "0" ], "adaptive_pressure_advance_model": [ + "0,0,0\n0,0,0", "0,0,0\n0,0,0" ], "adaptive_pressure_advance_overhangs": [ + "0", "0" ], "additional_cooling_fan_speed": [ + "70", "70" ], "chamber_temperature": [ @@ -39,6 +45,7 @@ "compatible_prints": [], "compatible_prints_condition": "", "complete_print_exhaust_fan_speed": [ + "80", "80" ], "cool_plate_temp": [ @@ -51,12 +58,14 @@ "0" ], "during_print_exhaust_fan_speed": [ + "60", "60" ], "enable_overhang_bridge_fan": [ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -69,9 +78,11 @@ "100" ], "fan_max_speed": [ + "70", "70" ], "fan_min_speed": [ + "70", "70" ], "filament_cooling_final_speed": [ @@ -90,6 +101,7 @@ "1.24" ], "filament_deretraction_speed": [ + "8", "8" ], "filament_diameter": [ @@ -99,6 +111,7 @@ "; filament end gcode \n" ], "filament_flow_ratio": [ + "1", "1" ], "filament_is_support": [ @@ -111,21 +124,27 @@ "3" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "3.2", "3.2" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_multitool_ramming": [ + "0", "0" ], "filament_multitool_ramming_flow": [ + "10", "10" ], "filament_multitool_ramming_volume": [ + "10", "10" ], "filament_notes": [ @@ -135,33 +154,43 @@ "120 100 6.6 6.8 7.2 7.6 7.9 8.2 8.7 9.4 9.9 10.0| 0.05 6.6 0.45 6.8 0.95 7.8 1.45 8.3 1.95 9.7 2.45 10 2.95 7.6 3.45 7.6 3.95 7.6 4.45 7.6 4.95 7.6" ], "filament_retract_before_wipe": [ + "nil", "nil" ], "filament_retract_lift_above": [ + "nil", "nil" ], "filament_retract_lift_below": [ + "nil", "nil" ], "filament_retract_lift_enforce": [ + "nil", "nil" ], "filament_retract_restart_extra": [ + "nil", "nil" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_retraction_length": [ + "1.4", "1.4" ], "filament_retraction_minimum_travel": [ + "nil", "nil" ], "filament_retraction_speed": [ + "30", "30" ], "filament_shrink": [ @@ -198,15 +227,19 @@ "Snapmaker" ], "filament_wipe": [ + "nil", "nil" ], "filament_wipe_distance": [ + "nil", "nil" ], "filament_z_hop": [ + "0.4", "0.4" ], "filament_z_hop_types": [ + "Auto Lift", "Auto Lift" ], "full_fan_speed_layer": [ @@ -222,15 +255,19 @@ "0" ], "nozzle_temperature": [ + "225", "225" ], "nozzle_temperature_initial_layer": [ + "225", "225" ], "nozzle_temperature_range_high": [ + "250", "250" ], "nozzle_temperature_range_low": [ + "200", "200" ], "overhang_fan_speed": [ @@ -243,6 +280,7 @@ "0.4157" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ @@ -280,5 +318,9 @@ ], "default_filament_colour": [ "" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json index b9619dcca5..605b74a3ed 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.6 nozzle.json @@ -16,75 +16,94 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "enable_pressure_advance": [ + "0", "0" ], "fan_cooling_layer_time": [ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1.067", "1.067" ], "filament_max_volumetric_speed": [ + "12", "12" ], "filament_multitool_ramming_flow": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "8", "8" ], "filament_retraction_length": [ + "0.8", "0.8" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "215", "215" ], "nozzle_temperature_initial_layer": [ + "215", "215" ], "overhang_fan_threshold": [ "95%" ], "pressure_advance": [ + "0.14", "0.14" ], "slow_down_layer_time": [ "8" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -94,6 +113,7 @@ "30" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -106,18 +126,23 @@ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -142,6 +167,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json index 4283ac2651..15d5e593ab 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1 0.8 nozzle.json @@ -16,75 +16,94 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "enable_pressure_advance": [ + "0", "0" ], "fan_cooling_layer_time": [ "100" ], "fan_max_speed": [ + "100", "100" ], "fan_min_speed": [ + "100", "100" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1.045", "1.045" ], "filament_max_volumetric_speed": [ + "16", "16" ], "filament_multitool_ramming_flow": [ + "15", "15" ], "filament_retract_length_toolchange": [ + "8", "8" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "215", "215" ], "nozzle_temperature_initial_layer": [ + "215", "215" ], "overhang_fan_threshold": [ "95%" ], "pressure_advance": [ + "0.12", "0.12" ], "slow_down_layer_time": [ "12" ], "additional_cooling_fan_speed": [ + "100", "100" ], "filament_z_hop_types": [ + "Slope Lift", "Slope Lift" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -94,6 +113,7 @@ "30" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -106,18 +126,23 @@ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -142,6 +167,11 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json index 816b78ceb8..dd61ccd234 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU 95A HF @U1.json @@ -16,69 +16,86 @@ "; filament end gcode \n\n" ], "filament_multitool_ramming": [ + "1", "1" ], "filament_multitool_ramming_volume": [ + "0.1", "0.1" ], "enable_pressure_advance": [ + "0", "0" ], "fan_cooling_layer_time": [ "40" ], "fan_max_speed": [ + "50", "50" ], "fan_min_speed": [ + "10", "10" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_flow_ratio": [ + "1.067", "1.067" ], "filament_max_volumetric_speed": [ + "9", "9" ], "filament_multitool_ramming_flow": [ + "10", "10" ], "filament_retract_length_toolchange": [ + "6", "6" ], "filament_retraction_length": [ + "1", "1" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_vendor": [ "Snapmaker" ], "nozzle_temperature": [ + "230", "230" ], "nozzle_temperature_initial_layer": [ + "230", "230" ], "overhang_fan_threshold": [ "25%" ], "pressure_advance": [ + "0.23", "0.23" ], "slow_down_layer_time": [ "10" ], "activate_air_filtration": [ + "0", "0" ], "chamber_temperatures": [ "0" ], "complete_print_exhaust_fan_speed": [ + "70", "70" ], "cool_plate_temp": [ @@ -88,6 +105,7 @@ "30" ], "during_print_exhaust_fan_speed": [ + "70", "70" ], "eng_plate_temp": [ @@ -100,21 +118,27 @@ "20" ], "filament_long_retractions_when_cut": [ + "nil", "nil" ], "filament_minimal_purge_on_wipe_tower": [ + "15", "15" ], "filament_retract_when_changing_layer": [ + "nil", "nil" ], "filament_retraction_distances_when_cut": [ + "nil", "nil" ], "filament_z_hop": [ + "nil", "nil" ], "filament_z_hop_types": [ + "nil", "nil" ], "hot_plate_temp": [ @@ -139,6 +163,15 @@ "35" ], "nozzle_temperature_range_low": [ + "200", "200" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json index ba393bed17..7de9731406 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json @@ -9,5 +9,25 @@ "Snapmaker U1 (0.4 nozzle)", "Snapmaker U1 (0.6 nozzle)", "Snapmaker U1 (0.8 nozzle)" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "filament_max_volumetric_speed": [ + "2.8", + "10.5" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json index 0aca011924..a3afba536b 100644 --- a/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json +++ b/resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json @@ -12,21 +12,42 @@ "Snapmaker U1 (0.8 nozzle)" ], "filament_flow_ratio": [ + "0.983", "0.983" ], "filament_deretraction_speed": [ + "nil", "nil" ], "filament_max_volumetric_speed": [ + "7.6", "7.6" ], "filament_retraction_length": [ + "0.8", "0.8" ], "filament_retraction_speed": [ + "nil", "nil" ], "filament_notes": [ "!! It needs to be dried before use.\nSnapmaker TPU 95A High-Flow\n" + ], + "filament_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "fan_min_speed": [ + "70", + "70" + ], + "fan_max_speed": [ + "70", + "70" + ], + "additional_cooling_fan_speed": [ + "70", + "70" ] } diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json index 674b82930c..6971ed458f 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.2" ], "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel", "hardened_steel", "hardened_steel", "hardened_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "2", + "2", + "2", + "2", "2", "2", "2", "2" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -209,6 +313,10 @@ "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\nTIMELAPSE_TAKE_FRAME\nDEFECT_DETECTION_DETECT", "machine_pause_gcode": "M600", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json index 3acd21c2dd..8438b121cb 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.4" ], "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel", "hardened_steel", "hardened_steel", "hardened_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "1.5", + "1.5", + "1.5", + "1.5", "1.5", "1.5", "1.5", "1.5" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "2", + "2", + "2", + "2", "2", "2", "2", "2" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -211,6 +315,10 @@ "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json index cc4e7a0515..72812a6ba6 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4+0.6 nozzle).json @@ -27,6 +27,10 @@ "0.6" ], "nozzle_type": [ + "stainless_steel", + "stainless_steel", + "stainless_steel", + "stainless_steel", "stainless_steel", "stainless_steel", "stainless_steel", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json index 98b6f7e683..ec01b97698 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.6" ], "nozzle_type": [ + "stainless_steel", + "stainless_steel", + "stainless_steel", + "stainless_steel", "stainless_steel", "stainless_steel", "stainless_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "1.4", + "1.4", + "1.4", + "1.4", "1.4", "1.4", "1.4", "1.4" ], "retraction_minimum_travel": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -210,6 +314,10 @@ "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json index 6ab566e0aa..5bc11525e9 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json @@ -10,6 +10,10 @@ "auxiliary_fan": "1", "change_filament_gcode": ";===== date: 20260607 =====================\n; Change Tool[previous_extruder] -> Tool[next_extruder] (layer [layer_num])\n; max_layer_z [max_layer_z]\n; max_print_height [max_print_height]\n; print_sequence [print_sequence]\n\n{\nlocal move_z = 1.5;\nlocal max_speed_toolchange = 350.0;\nlocal wait_for_extruder_temp = true;\nposition[2] = position[2] + 2.0;\nlocal speed_toolchange = max_speed_toolchange;\n\nif travel_speed < max_speed_toolchange then\n speed_toolchange = travel_speed;\nendif\n\nif print_sequence == \"by object\" then\n\n if max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\n endif\n\nendif\n\n\"G91\nG1 Z\" + move_z + \" F600\nG90\n\";\n\"G1 F\" + (speed_toolchange * 60) + \"\n\";\nif wait_for_extruder_temp and not((layer_num < 0) and (next_extruder == initial_tool)) then\n \"\n\";\n \"; \" + layer_num + \"\n\";\n if layer_num == 0 then\n \"M109 S\" + first_layer_temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n else\n \"M109 S\" + temperature[next_extruder] + \" T\" + next_extruder + \"\n\";\n endif\nendif\n\"M400\" + \"\n\";\n\"T\" + next_extruder + \"\n\";\nif filament_type[next_extruder] == \"PVA\" then\n\"SET_VELOCITY_LIMIT ACCEL=3000\n\";\nelse\nendif\nif previous_extruder != next_extruder and initial_extruder != next_extruder then\n\"SM_PRINT_PREEXTRUDE_FILAMENT INDEX=\" + next_extruder + \"\n\";\nendif\n\"G90\n\";\n}\n", "deretraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -29,13 +33,25 @@ ], "host_type": "octoprint", "long_retractions_when_cut": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], - "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n", + "machine_end_gcode": ";===== date: 20260605 =====================\n; layer [layer_num]\n; max_layer_z [max_layer_z]\n; print_sequence [print_sequence]\n\n{if print_sequence == \"by object\"}\n{\nlocal move_z = max_print_height;\n\nif max_layer_z < ((max_print_height - z_offset) - 2) then\n move_z = z_offset + min(((max_layer_z - z_offset) + 2), max_print_height);\nendif\n}\n\nG91\nG1 X2 Y2 Z1 F24000\nG90\nG1 Z{move_z} F600\n{endif}\n\nPRINT_END\nTIMELAPSE_STOP\n\n; U1 nozzle flow metadata, in logical filament order\n; filament_volume_type = {(nozzle_volume_type[filament_map[0]-1] == 1 ? \"high_flow\" : \"standard\")}{if size(filament_type) > 1},{(nozzle_volume_type[filament_map[1]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 2},{(nozzle_volume_type[filament_map[2]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}{if size(filament_type) > 3},{(nozzle_volume_type[filament_map[3]-1] == 1 ? \"high_flow\" : \"standard\")}{endif}\n", "machine_max_jerk_z": [ + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", + "3", + "0.4", "3", "0.4", "3", @@ -46,6 +62,14 @@ "0.4" ], "machine_max_speed_e": [ + "30", + "25", + "30", + "25", + "30", + "25", + "30", + "25", "30", "25", "30", @@ -56,6 +80,14 @@ "25" ], "machine_max_speed_z": [ + "20", + "12", + "20", + "12", + "20", + "12", + "20", + "12", "20", "12", "20", @@ -86,6 +118,10 @@ "0.8" ], "nozzle_type": [ + "hardened_steel", + "hardened_steel", + "hardened_steel", + "hardened_steel", "hardened_steel", "hardened_steel", "hardened_steel", @@ -99,72 +135,120 @@ ], "printable_height": "270.05", "retract_before_wipe": [ + "0%", + "0%", + "0%", + "0%", "0%", "0%", "0%", "0%" ], "retract_length_toolchange": [ + "10", + "10", + "10", + "10", "10", "10", "10", "10" ], "retract_lift_above": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_lift_below": [ + "269", + "269", + "269", + "269", "269", "269", "269", "269" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", + "0", "0", "0", "0", "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", + "18", "18", "18", "18", "18" ], "retraction_length": [ + "1.5", + "1.5", + "1.5", + "1.5", "1.5", "1.5", "1.5", "1.5" ], "retraction_minimum_travel": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "retraction_speed": [ + "30", + "30", + "30", + "30", "30", "30", "30", @@ -172,30 +256,50 @@ ], "thumbnails": "48x48/PNG, 300x300/PNG", "travel_slope": [ + "3", + "3", + "3", + "3", "3", "3", "3", "3" ], "wipe": [ + "1", + "1", + "1", + "1", "1", "1", "1", "1" ], "wipe_distance": [ + "2", + "2", + "2", + "2", "2", "2", "2", "2" ], "z_hop": [ + "0.4", + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", "0.4" ], "z_hop_types": [ + "Auto Lift", + "Auto Lift", + "Auto Lift", + "Auto Lift", "Auto Lift", "Auto Lift", "Auto Lift", @@ -210,6 +314,10 @@ "machine_pause_gcode": "M600", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER={layer_num+1}", "nozzle_volume": [ + "143", + "143", + "143", + "143", "143", "143", "143", diff --git a/resources/profiles/Snapmaker/machine/Snapmaker U1.json b/resources/profiles/Snapmaker/machine/Snapmaker U1.json index 96eb53f81a..37169b4193 100644 --- a/resources/profiles/Snapmaker/machine/Snapmaker U1.json +++ b/resources/profiles/Snapmaker/machine/Snapmaker U1.json @@ -5,7 +5,7 @@ "family": "Snapmaker", "url": "", "model_id": "797581801", - "default_materials": "Snapmaker PLA SnapSpeed @U1 0.2 nozzle;Panchroma PLA @Snapmaker U1;Generic PLA @System;Snapmaker PLA SnapSpeed @U1 0.6 nozzle;Snapmaker PLA SnapSpeed @U1 0.8 nozzle", + "default_materials": "Snapmaker PLA SnapSpeed @U1 0.2 nozzle;Panchroma PLA @Snapmaker U1;Generic PLA @System;Generic PLA @U1 0.2 nozzle;Generic PLA @U1 0.4 nozzle;Generic PLA @U1 0.6 nozzle;Generic PLA @U1 0.8 nozzle;Snapmaker PLA SnapSpeed @U1 0.6 nozzle;Snapmaker PLA SnapSpeed @U1 0.8 nozzle;Snapmaker PLA SnapSpeed @U1", "bed_model": "Snapmaker U1_bed.stl", "bed_texture": "Snapmaker U1_texture.svg", "nozzle_diameter": "0.2;0.4;0.4+0.6;0.6;0.8" diff --git a/resources/profiles/Snapmaker/machine/fdm_U1.json b/resources/profiles/Snapmaker/machine/fdm_U1.json index 0b3d89a303..17389ae8fc 100644 --- a/resources/profiles/Snapmaker/machine/fdm_U1.json +++ b/resources/profiles/Snapmaker/machine/fdm_U1.json @@ -12,17 +12,18 @@ "0.32", "0.32", "0.32", - "0.32", "0.32" ], "min_layer_height": [ "0.08", "0.08", "0.08", - "0.08", "0.08" ], "deretraction_speed": [ + "30", + "30", + "30", "30", "30", "30", @@ -33,17 +34,18 @@ "#FCE94F", "#FCE94F", "#FCE94F", - "#FCE94F", "#FCE94F" ], "extruder_offset": [ "0x0", "0x0", "0x0", - "0x0", "0x0" ], "long_retractions_when_cut": [ + "0", + "0", + "0", "0", "0", "0", @@ -54,10 +56,12 @@ "0.4", "0.4", "0.4", - "0.4", "0.4" ], "retract_before_wipe": [ + "70%", + "70%", + "70%", "70%", "70%", "70%", @@ -65,6 +69,9 @@ "70%" ], "retract_length_toolchange": [ + "2", + "2", + "2", "2", "2", "2", @@ -72,6 +79,9 @@ "2" ], "retract_lift_above": [ + "0", + "0", + "0", "0", "0", "0", @@ -79,6 +89,9 @@ "0" ], "retract_lift_below": [ + "0", + "0", + "0", "0", "0", "0", @@ -86,6 +99,9 @@ "0" ], "retract_lift_enforce": [ + "All Surfaces", + "All Surfaces", + "All Surfaces", "All Surfaces", "All Surfaces", "All Surfaces", @@ -93,6 +109,9 @@ "All Surfaces" ], "retract_restart_extra": [ + "0", + "0", + "0", "0", "0", "0", @@ -100,6 +119,9 @@ "0" ], "retract_restart_extra_toolchange": [ + "0", + "0", + "0", "0", "0", "0", @@ -107,6 +129,9 @@ "0" ], "retract_when_changing_layer": [ + "1", + "1", + "1", "1", "1", "1", @@ -114,6 +139,9 @@ "1" ], "retraction_distances_when_cut": [ + "18", + "18", + "18", "18", "18", "18", @@ -121,6 +149,9 @@ "18" ], "retraction_length": [ + "0.8", + "0.8", + "0.8", "0.8", "0.8", "0.8", @@ -128,6 +159,9 @@ "0.8" ], "retraction_minimum_travel": [ + "1", + "1", + "1", "1", "1", "1", @@ -135,6 +169,9 @@ "1" ], "retraction_speed": [ + "30", + "30", + "30", "30", "30", "30", @@ -142,6 +179,9 @@ "30" ], "travel_slope": [ + "3", + "3", + "3", "3", "3", "3", @@ -149,6 +189,9 @@ "3" ], "wipe": [ + "1", + "1", + "1", "1", "1", "1", @@ -156,6 +199,9 @@ "1" ], "wipe_distance": [ + "1", + "1", + "1", "1", "1", "1", @@ -163,6 +209,9 @@ "1" ], "z_hop": [ + "0.4", + "0.4", + "0.4", "0.4", "0.4", "0.4", @@ -170,6 +219,9 @@ "0.4" ], "z_hop_types": [ + "Normal Lift", + "Normal Lift", + "Normal Lift", "Normal Lift", "Normal Lift", "Normal Lift", @@ -181,7 +233,16 @@ "change_filament_gcode": "", "machine_start_gcode": "PRINT_START TOOL_TEMP={first_layer_temperature[initial_tool]} {if is_extruder_used[0]}T0_TEMP={first_layer_temperature[0]}{endif} {if is_extruder_used[1]}T1_TEMP={first_layer_temperature[1]}{endif} {if is_extruder_used[2]}T2_TEMP={first_layer_temperature[2]}{endif} {if is_extruder_used[3]}T3_TEMP={first_layer_temperature[3]}{endif} {if is_extruder_used[4]}T4_TEMP={first_layer_temperature[4]}{endif} {if is_extruder_used[5]}T5_TEMP={first_layer_temperature[5]}{endif} BED_TEMP=[first_layer_bed_temperature] TOOL=[initial_tool]\n\nM83\n; set extruder temp\n{if first_layer_temperature[0] > 0 and (is_extruder_used[0])}M104 T0 S{first_layer_temperature[0]}{endif}\n{if first_layer_temperature[1] > 0 and (is_extruder_used[1])}M104 T1 S{first_layer_temperature[1]}{endif}\n{if first_layer_temperature[2] > 0 and (is_extruder_used[2])}M104 T2 S{first_layer_temperature[2]}{endif}\n{if first_layer_temperature[3] > 0 and (is_extruder_used[3])}M104 T3 S{first_layer_temperature[3]}{endif}\n{if first_layer_temperature[4] > 0 and (is_extruder_used[4])}M104 T4 S{first_layer_temperature[4]}{endif}\n{if (is_extruder_used[0]) and initial_tool != 0}\n;\n; purge first tool\n;\nG1 F{travel_speed * 60}\nM109 T0 S{first_layer_temperature[0]}\nT0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(0 == 0 ? 0 : (0 == 1 ? 120 : (0 == 2 ? 180 : 300)))} Y{(0 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[0]}10{else}30{endif} X40 Z0.2 F{if filament_multitool_ramming[0]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X40 E9 F800 ; continue purging and wipe the nozzle\nG0 X{40 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{40 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[0]} F2400 ; retract\n{e_retracted[0] = 1.5 * retract_length[0]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[0] == 0 ? (first_layer_temperature[0] + standby_temperature_delta) : (idle_temperature[0]))} T0\n{endif}\n{if (is_extruder_used[1]) and initial_tool != 1}\n;\n; purge second tool\n;\nG1 F{travel_speed * 60}\nM109 T1 S{first_layer_temperature[1]}\nT1; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(1 == 0 ? 0 : (1 == 1 ? 120 : (1 == 2 ? 180 : 300)))} Y{(1 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[1]}10{else}30{endif} X120 Z0.2 F{if filament_multitool_ramming[1]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X80 E9 F800 ; continue purging and wipe the nozzle\nG0 X{80 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{80 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[1]} F2400 ; retract\n{e_retracted[1] = 1.5 * retract_length[1]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[1] == 0 ? (first_layer_temperature[1] + standby_temperature_delta) : (idle_temperature[1]))} T1\n{endif}\n{if (is_extruder_used[2]) and initial_tool != 2}\n;\n; purge third tool\n;\nG1 F{travel_speed * 60}\nM109 T2 S{first_layer_temperature[2]}\nT2; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(2 == 0 ? 0 : (2 == 1 ? 120 : (2 == 2 ? 180 : 300)))} Y{(2 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[2]}10{else}30{endif} X220 Z0.2 F{if filament_multitool_ramming[2]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X220 E9 F800 ; continue purging and wipe the nozzle\nG0 X{220 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{220 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[2]} F2400 ; retract\n{e_retracted[2] = 1.5 * retract_length[2]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[2] == 0 ? (first_layer_temperature[2] + standby_temperature_delta) : (idle_temperature[2]))} T2\n{endif}\n{if (is_extruder_used[3]) and initial_tool != 3}\n;\n; purge fourth tool\n;\nG1 F{travel_speed * 60}\nM109 T3 S{first_layer_temperature[3]}\nT3; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(3 == 0 ? 0 : (3 == 1 ? 120 : (3 == 2 ? 180 : 300)))} Y{(3 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[3]}10{else}30{endif} X290 Z0.2 F{if filament_multitool_ramming[3]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X260 E9 F800 ; continue purging and wipe the nozzle\nG0 X{260 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{260 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[3]} F2400 ; retract\n{e_retracted[3] = 1.5 * retract_length[3]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[3] == 0 ? (first_layer_temperature[3] + standby_temperature_delta) : (idle_temperature[3]))} T3\n{endif}\n{if (is_extruder_used[4]) and initial_tool != 4}\n;\n; purge fifth tool\n;\nG1 F{travel_speed * 60}\nM109 T4 S{first_layer_temperature[4]}\nT4; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(4 == 0 ? 0 : (4 == 1 ? 120 : (4 == 2 ? 180 : 300)))} Y{(4 < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[4]}10{else}30{endif} X290 Z0.2 F{if filament_multitool_ramming[4]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X260 E9 F800 ; continue purging and wipe the nozzle\nG0 X{260 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{260 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[4]} F2400 ; retract\n{e_retracted[4] = 1.5 * retract_length[4]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(idle_temperature[4] == 0 ? (first_layer_temperature[4] + standby_temperature_delta) : (idle_temperature[4]))} T4\n{endif}\n;\n; purge initial tool\n;\nG1 F{travel_speed * 60}\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]}\nT{initial_tool}; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300)))} Y{(initial_tool < 4 ? 0 : 3)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if filament_multitool_ramming[initial_tool]}10{else}30{endif} X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 10)} Z0.2 F{if filament_multitool_ramming[initial_tool]}500{else}170{endif} ; purge while moving towards the sheet\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40)} E9 F800 ; continue purging and wipe the nozzle\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3)} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{(initial_tool == 0 ? 0 : (initial_tool == 1 ? 120 : (initial_tool == 2 ? 180 : 300))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3 * 2)} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[initial_tool]} F2400 ; retract\n{e_retracted[initial_tool] = 1.5 * retract_length[initial_tool]}\nG92 E0 ; reset extruder position\n", "scan_first_layer": "0", - "nozzle_type": "undefine", + "nozzle_type": [ + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine", + "undefine" + ], "auxiliary_fan": "0", "support_multi_bed_types": "1", "default_bed_type": "Textured PEI Plate", @@ -194,5 +255,307 @@ "printable_height": "270.05", "bed_mesh_min": "3,3", "bed_mesh_max": "267,267", - "printer_agent": "snapmaker" + "printer_agent": "snapmaker", + "printer_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "printer_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "extruder_variant_list": [ + "Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow", + "Direct Drive Standard,Direct Drive High Flow" + ], + "default_nozzle_volume_type": [ + "Standard", + "Standard", + "Standard", + "Standard" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5", + "2.5" + ], + "machine_max_acceleration_y": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_acceleration_e": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "machine_max_jerk_x": [ + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9" + ], + "machine_max_jerk_y": [ + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9", + "9" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_speed_y": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_speed_e": [ + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25", + "25" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000", + "5000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_speed_x": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_speed_z": [ + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12", + "12" + ], + "machine_max_acceleration_z": [ + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500", + "200" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000", + "20000" + ], + "machine_max_jerk_z": [ + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4", + "0.2", + "0.4" + ] } diff --git a/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json index 15546ce4bb..357aeda830 100644 --- a/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.06 High Quality @Snapmaker U1 (0.2 nozzle).json @@ -1,15 +1,43 @@ { "type": "process", "name": "0.06 High Quality @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.06 High Quality Snapmaker U1 (0.2 nozzle);0.06 High Quality @Snapmaker U1 (0.2 High Flow nozzle);0.06 High Quality Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.06_nozzle_0.2", "from": "system", "setting_id": "3SCofR6VrVyo3vJp", "instantiation": "true", "description": "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in minimal layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], "elefant_foot_compensation": "0.15", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" @@ -20,10 +48,69 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "13.5", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json index 3881460bda..88bc187c8e 100644 --- a/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.06 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.06 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.06 Standard Snapmaker U1 (0.2 nozzle);0.06 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.06 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.06_nozzle_0.2", "from": "system", "setting_id": "997RaiNHd2YhpaRB", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "13.5", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json index 0a3ba43c86..d102118041 100644 --- a/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Extra Fine @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.08 Extra Fine @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.08 Extra Fine Snapmaker U1 (0.4 nozzle);0.08 Extra Fine @Snapmaker U1 (0.4 High Flow nozzle);0.08 Extra Fine Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.08", "from": "system", "setting_id": "Tayg0K1WRyJMLoke", @@ -12,17 +13,85 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", "wipe_tower_cone_angle": "15", "wipe_tower_extra_spacing": "120%", "enable_arc_fitting": "0", - "outer_wall_speed": "100", + "outer_wall_speed": [ + "100", + "500", + "100", + "500", + "100", + "500", + "100", + "500" + ], "precise_outer_wall": "1", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "inner_wall_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "sparse_infill_speed": [ + "450", + "600", + "450", + "600", + "450", + "600", + "450", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json index 2aeb309d58..b5d2ade0a4 100644 --- a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.2 nozzle).json @@ -1,15 +1,43 @@ { "type": "process", "name": "0.08 High Quality @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.08 High Quality Snapmaker U1 (0.2 nozzle);0.08 High Quality @Snapmaker U1 (0.2 High Flow nozzle);0.08 High Quality Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.08_nozzle_0.2", "from": "system", "setting_id": "6ExpMU3Wq4J1R7wy", "instantiation": "true", "description": "Compared with the default profile of a 0.2 mm nozzle, it has a smaller layer lines, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost invisible layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], "elefant_foot_compensation": "0.15", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" @@ -20,10 +48,69 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json index 107731b2cb..81b775fb9d 100644 --- a/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 High Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,27 +1,109 @@ { "type": "process", "name": "0.08 High Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.08 High Quality Snapmaker U1 (0.4 nozzle);0.08 High Quality @Snapmaker U1 (0.4 High Flow nozzle);0.08 High Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.08", "from": "system", "setting_id": "Bld9ulv0wFza7OCb", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost negligible layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", - "gap_infill_speed": "210", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], + "gap_infill_speed": [ + "210", + "210", + "210", + "210", + "210", + "210", + "210", + "210" + ], + "inner_wall_speed": [ + "120", + "600", + "120", + "600", + "120", + "600", + "120", + "600" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", - "top_surface_speed": "150", + "sparse_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "top_surface_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" ], "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -32,5 +114,25 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json index ea8c719085..16f85b3466 100644 --- a/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.08 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.08 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.08 Standard Snapmaker U1 (0.2 nozzle);0.08 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.08 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.08_nozzle_0.2", "from": "system", "setting_id": "loFrCYH9ux2L5JpZ", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "18", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json index 6fc26cd55f..95719fcc46 100644 --- a/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.10 High Quality @Snapmaker U1 (0.2 nozzle).json @@ -1,15 +1,43 @@ { "type": "process", "name": "0.10 High Quality @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.10 High Quality Snapmaker U1 (0.2 nozzle);0.10 High Quality @Snapmaker U1 (0.2 High Flow nozzle);0.10 High Quality Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.10_nozzle_0.2", "from": "system", "setting_id": "BfLpmnJnSBYBFInR", "instantiation": "true", "description": "Compared with the default profile of a 0.2 mm nozzle, it has lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in much higher printing quality, but a much longer printing time.", - "default_acceleration": "4000", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], "elefant_foot_compensation": "0.15", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", "compatible_printers": [ "Snapmaker U1 (0.2 nozzle)" @@ -20,10 +48,69 @@ "prime_tower_brim_width": "5", "prime_tower_width": "28", "prime_volume": "25", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json index d33ce1c083..d654bca839 100644 --- a/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.10 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.10 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.10 Standard Snapmaker U1 (0.2 nozzle);0.10 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.10 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.10_nozzle_0.2", "from": "system", "setting_id": "SOq962UWv1ml1Mk0", @@ -23,5 +24,74 @@ "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", "wipe_tower_wall_type": "rib", - "slowdown_for_curled_perimeters": "0" + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json index 6de6d483da..7552908319 100644 --- a/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Fine @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.12 Fine @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.12 Fine Snapmaker U1 (0.4 nozzle);0.12 Fine @Snapmaker U1 (0.4 High Flow nozzle);0.12 Fine Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.12", "from": "system", "setting_id": "xBU1j8ldOefYfosp", @@ -10,7 +11,16 @@ "Snapmaker U1 (0.4 nozzle)" ], "ooze_prevention": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -24,5 +34,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "inner_wall_speed": [ + "350", + "600", + "350", + "600", + "350", + "600", + "350", + "600" + ], + "sparse_infill_speed": [ + "430", + "600", + "430", + "600", + "430", + "600", + "430", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json index a5f215d7f3..7e473aeb2c 100644 --- a/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 High Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,26 +1,108 @@ { "type": "process", "name": "0.12 High Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.12 High Quality Snapmaker U1 (0.4 nozzle);0.12 High Quality @Snapmaker U1 (0.4 High Flow nozzle);0.12 High Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.12", "from": "system", "setting_id": "WNWFsx5DJtCRAlFl", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in almost negligible layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", - "gap_infill_speed": "230", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], + "gap_infill_speed": [ + "230", + "230", + "230", + "230", + "230", + "230", + "230", + "230" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "internal_solid_infill_speed": [ + "180", + "600", + "180", + "600", + "180", + "600", + "180", + "600" + ], + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", - "top_surface_speed": "150", + "sparse_infill_speed": [ + "180", + "600", + "180", + "600", + "180", + "600", + "180", + "600" + ], + "top_surface_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" ], "prime_tower_width": "30", "prime_volume": "27", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "wipe_tower_filament": "0", "prime_tower_brim_width": "5", "wipe_tower_cone_angle": "15", @@ -33,5 +115,25 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json index 632d9614f7..d6038972a6 100644 --- a/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.12 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.12 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.12 Standard Snapmaker U1 (0.2 nozzle);0.12 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.12 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.12_nozzle_0.2", "from": "system", "setting_id": "KHC1zpxpuvaUEzvf", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "28", "prime_volume": "27", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json b/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json index 0de823db1f..0bc45246f0 100644 --- a/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.14 Standard @Snapmaker U1 (0.2 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.14 Standard @Snapmaker U1 (0.2 nozzle)", + "renamed_from": "0.14 Standard Snapmaker U1 (0.2 nozzle);0.14 Standard @Snapmaker U1 (0.2 High Flow nozzle);0.14 Standard Snapmaker U1 (0.2 High Flow nozzle)", "inherits": "fdm_process_U1_0.14_nozzle_0.2", "from": "system", "setting_id": "NGJoV0n6T510y9wM", @@ -16,10 +17,79 @@ "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "32", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_extra_spacing": "120%", - "wipe_tower_wall_type": "rib" + "wipe_tower_wall_type": "rib", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json index 1306485d6f..ef1d0be7c0 100644 --- a/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 High Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,27 +1,109 @@ { "type": "process", "name": "0.16 High Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.16 High Quality Snapmaker U1 (0.4 nozzle);0.16 High Quality @Snapmaker U1 (0.4 High Flow nozzle);0.16 High Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.16", "from": "system", "setting_id": "Ofe17WrGQ3MOrqNe", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has a smaller layer height, lower speeds and acceleration, and the sparse infill pattern is Gyroid. So, it results in less apparent layer lines and much higher printing quality, but much longer printing time.", - "default_acceleration": "4000", - "gap_infill_speed": "250", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", + "default_acceleration": [ + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000", + "4000" + ], + "gap_infill_speed": [ + "250", + "250", + "250", + "250", + "250", + "250", + "250", + "250" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "internal_solid_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "outer_wall_acceleration": [ + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000", + "2000" + ], + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", - "top_surface_speed": "150", + "sparse_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "top_surface_speed": [ + "150", + "150", + "150", + "150", + "150", + "150", + "150", + "150" + ], "compatible_printers": [ "Snapmaker U1 (0.4 nozzle)" ], "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "36", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -33,5 +115,25 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json index 838f250e8c..79c1ad6f8f 100644 --- a/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.16 Optimal @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.16 Optimal @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.16 Optimal Snapmaker U1 (0.4 nozzle);0.16 Optimal @Snapmaker U1 (0.4 High Flow nozzle);0.16 Optimal Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.16", "from": "system", "setting_id": "ERcgRLp5bQo1hgz8", @@ -12,7 +13,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "36", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -23,5 +33,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "330", + "600", + "330", + "600", + "330", + "600", + "330", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json index 88fbb33812..cbe81ad191 100644 --- a/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.18 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.18 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.18 Standard Snapmaker U1 (0.6 nozzle);0.18 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.18 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.18_nozzle_0.6", "from": "system", "setting_id": "XGSrVgnsUFv6uCRs", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "layer_height": "0.25", "prime_tower_brim_width": "5", "prime_tower_width": "30", @@ -24,7 +34,76 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json index be894aa221..087ecfce38 100644 --- a/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Quality @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Quality @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Quality Snapmaker U1 (0.4 nozzle);0.20 Quality @Snapmaker U1 (0.4 High Flow nozzle);0.20 Quality Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "BBXxXQCXCme2Mvy0", @@ -11,11 +12,80 @@ ], "ooze_prevention": "1", "prime_tower_width": "30", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", "wipe_tower_cone_angle": "15", "prime_tower_brim_width": "5", - "initial_layer_print_height": "0.25" + "initial_layer_print_height": "0.25", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json index 443afe55dd..6db6d02815 100644 --- a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Standard @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Standard Snapmaker U1 (0.4 nozzle);0.20 Standard @Snapmaker U1 (0.4 High Flow nozzle);0.20 Standard Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "XR5r9SuWmSag5Qjo", @@ -12,11 +13,80 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "45", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", "wipe_tower_cone_angle": "15", "prime_tower_brim_width": "5", - "initial_layer_print_height": "0.25" + "initial_layer_print_height": "0.25", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json index 5c87ff68d0..205c968786 100644 --- a/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.20 Standard Snapmaker U1 (0.6 nozzle);0.20 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.20 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.6_common", "from": "system", "setting_id": "6VM4QhgvHUmyf2um", @@ -12,7 +13,16 @@ ], "ooze_prevention": "1", "prime_tower_width": "30", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -20,5 +30,65 @@ "prime_tower_brim_width": "5", "initial_layer_print_height": "0.25", "top_shell_layers": "4", - "bottom_shell_layers": "3" + "bottom_shell_layers": "3", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json index 1d051fc801..d9c7d9a63d 100644 --- a/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Strength @Snapmaker U1 (0.4 nozzle).json @@ -1,12 +1,22 @@ { "type": "process", "name": "0.20 Strength @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Strength Snapmaker U1 (0.4 nozzle);0.20 Strength @Snapmaker U1 (0.4 High Flow nozzle);0.20 Strength Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "bYnMOZxTq83EwIyd", "instantiation": "true", "description": "Compared with the default profile of a 0.4 mm nozzle, it has more wall loops and a higher sparse infill density. So, it results in higher strength of the prints, but more filament consumption and longer printing time.", - "outer_wall_speed": "60", + "outer_wall_speed": [ + "60", + "500", + "60", + "500", + "60", + "500", + "60", + "500" + ], "sparse_infill_density": "25%", "wall_loops": "6", "compatible_printers": [ @@ -15,7 +25,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "45", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -26,5 +45,55 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json index 577065ca3f..fe14010038 100644 --- a/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Support @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Support @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Support Snapmaker U1 (0.4 nozzle);0.20 Support @Snapmaker U1 (0.4 High Flow nozzle);0.20 Support Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "4whjHJVCN44w8SPE", @@ -12,7 +13,16 @@ "ooze_prevention": "1", "prime_tower_width": "40", "prime_volume": "15", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -21,5 +31,65 @@ "enable_support": "1", "initial_layer_print_height": "0.25", "support_interface_spacing": "0", - "support_interface_top_layers": "3" + "support_interface_top_layers": "3", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json index 3d1887bea9..691b72de65 100644 --- a/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.20 Support W @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.20 Support W @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.20 Support W Snapmaker U1 (0.4 nozzle);0.20 Support W @Snapmaker U1 (0.4 High Flow nozzle);0.20 Support W Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.20", "from": "system", "setting_id": "M9JhI2roLcP4jYks", @@ -10,7 +11,16 @@ "support_top_z_distance": "0.2", "support_interface_loop_pattern": "1", "support_interface_spacing": "0", - "support_interface_speed": "80", + "support_interface_speed": [ + "80", + "80", + "80", + "80", + "80", + "80", + "80", + "80" + ], "support_filament": "0", "support_interface_filament": "0", "enable_prime_tower": "1", @@ -20,6 +30,75 @@ "ooze_prevention": "1", "prime_tower_width": "50", "prime_volume": "38", - "slowdown_for_curled_perimeters": "0", - "standby_temperature_delta": "-150" + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "standby_temperature_delta": "-150", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "250", + "600", + "250", + "600", + "250", + "600", + "250", + "600" + ], + "inner_wall_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "sparse_infill_speed": [ + "270", + "600", + "270", + "600", + "270", + "600", + "270", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json index 8e09376daf..f628b2947b 100644 --- a/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Draft @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24 Draft @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.24 Draft Snapmaker U1 (0.4 nozzle);0.24 Draft @Snapmaker U1 (0.4 High Flow nozzle);0.24 Draft Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.24", "from": "system", "setting_id": "MYRo7jTenu7F0Zv4", @@ -12,7 +13,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "54", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "prime_tower_brim_width": "5", @@ -23,5 +33,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "230", + "600", + "230", + "600", + "230", + "600", + "230", + "600" + ], + "inner_wall_speed": [ + "230", + "600", + "230", + "600", + "230", + "600", + "230", + "600" + ], + "sparse_infill_speed": [ + "230", + "600", + "230", + "600", + "230", + "600", + "230", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json index 2fa2eeabdb..d5f4513a58 100644 --- a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.24 Standard Snapmaker U1 (0.6 nozzle);0.24 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.24 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.24_nozzle_0.6", "from": "system", "setting_id": "BziJYuA5U5gWm6FM", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "55", @@ -23,8 +33,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json index 316bb0dbee..1865821910 100644 --- a/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.24 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.24 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.24 Standard Snapmaker U1 (0.8 nozzle);0.24 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.24 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.24_nozzle_0.8", "from": "system", "setting_id": "QcJ5p9h0eYUb91ak", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "min_width_top_surface": "90", "prime_tower_brim_width": "5", "prime_tower_width": "30", @@ -24,7 +34,76 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json index 2dcf03d540..0b012c715a 100644 --- a/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.25 Benchy @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.25 Benchy @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.25 Benchy Snapmaker U1 (0.4 nozzle);0.25 Benchy @Snapmaker U1 (0.4 High Flow nozzle);0.25 Benchy Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1", "from": "system", "setting_id": "deA4Xg6QxFTKOYZy", @@ -11,19 +12,127 @@ "elefant_foot_compensation": "0.15", "top_shell_layers": "3", "top_shell_thickness": "0.5", - "initial_layer_speed": "100", - "initial_layer_infill_speed": "180", - "outer_wall_speed": "180", - "inner_wall_speed": "200", - "sparse_infill_speed": "200", - "internal_solid_infill_speed": "200", - "top_surface_speed": "180", - "gap_infill_speed": "200", + "initial_layer_speed": [ + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100" + ], + "initial_layer_infill_speed": [ + "180", + "180", + "180", + "180", + "180", + "180", + "180", + "180" + ], + "outer_wall_speed": [ + "180", + "500", + "180", + "500", + "180", + "500", + "180", + "500" + ], + "inner_wall_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "sparse_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "internal_solid_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "top_surface_speed": [ + "180", + "180", + "180", + "180", + "180", + "180", + "180", + "180" + ], + "gap_infill_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], "ironing_speed": "30", - "enable_overhang_speed": "0", - "overhang_1_4_speed": "180", - "overhang_2_4_speed": "20", - "overhang_3_4_speed": "10", + "enable_overhang_speed": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], + "overhang_1_4_speed": [ + "180", + "180", + "180", + "180", + "180", + "180", + "180", + "180" + ], + "overhang_2_4_speed": [ + "20", + "20", + "20", + "20", + "20", + "20", + "20", + "20" + ], + "overhang_3_4_speed": [ + "10", + "10", + "10", + "10", + "10", + "10", + "10", + "10" + ], "layer_height": "0.25", "initial_layer_print_height": "0.25", "detect_overhang_wall": "0", @@ -46,15 +155,134 @@ "sparse_infill_line_width": "0.5", "top_surface_line_width": "0.5", "bottom_shell_layers": "2", - "initial_layer_travel_speed": "100%", - "bridge_acceleration": "3000", - "bridge_speed": "100", - "default_acceleration": "3000", - "inner_wall_acceleration": "3000", - "internal_solid_infill_acceleration": "3000", - "outer_wall_acceleration": "1600", - "small_perimeter_speed": "200", - "sparse_infill_acceleration": "3000", - "top_surface_acceleration": "3000", - "initial_layer_acceleration": "1600" + "initial_layer_travel_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], + "bridge_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "bridge_speed": [ + "100", + "100", + "100", + "100", + "100", + "100", + "100", + "100" + ], + "default_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "inner_wall_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "internal_solid_infill_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "outer_wall_acceleration": [ + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600" + ], + "small_perimeter_speed": [ + "200", + "200", + "200", + "200", + "200", + "200", + "200", + "200" + ], + "sparse_infill_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "top_surface_acceleration": [ + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000", + "3000" + ], + "initial_layer_acceleration": [ + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600", + "1600" + ], + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json index 8829efafdb..a963be5571 100644 --- a/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.28 Extra Draft @Snapmaker U1 (0.4 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.28 Extra Draft @Snapmaker U1 (0.4 nozzle)", + "renamed_from": "0.28 Extra Draft Snapmaker U1 (0.4 nozzle);0.28 Extra Draft @Snapmaker U1 (0.4 High Flow nozzle);0.28 Extra Draft Snapmaker U1 (0.4 High Flow nozzle)", "inherits": "fdm_process_U1_0.28", "from": "system", "setting_id": "0fSeyAIS6z75A1r3", @@ -11,7 +12,16 @@ ], "prime_tower_width": "30", "prime_volume": "63", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "wipe_tower_filament": "0", "prime_tower_brim_width": "5", "wipe_tower_cone_angle": "15", @@ -23,5 +33,65 @@ "support_type": "tree(auto)", "wipe_tower_extra_rib_length": "8", "wipe_tower_wall_type": "rib", - "gap_fill_target": "topbottom" + "gap_fill_target": "topbottom", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "inner_wall_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "sparse_infill_speed": [ + "200", + "600", + "200", + "600", + "200", + "600", + "200", + "600" + ], + "outer_wall_speed": [ + "200", + "500", + "200", + "500", + "200", + "500", + "200", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json index defbc6740b..b664e2b447 100644 --- a/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.30 Draft @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30 Draft @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.30 Draft Snapmaker U1 (0.6 nozzle);0.30 Draft @Snapmaker U1 (0.6 High Flow nozzle);0.30 Draft Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.6_common", "from": "system", "setting_id": "Tk3tG3RGJ8dwXFKf", @@ -13,7 +14,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "68", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -22,8 +32,64 @@ "initial_layer_print_height": "0.30", "top_shell_layers": "3", "bottom_shell_layers": "3", - "outer_wall_speed": "220", - "inner_wall_speed": "330", - "sparse_infill_speed": "300", - "internal_solid_infill_speed": "280" + "outer_wall_speed": [ + "220", + "500", + "220", + "500", + "220", + "500", + "220", + "500" + ], + "inner_wall_speed": [ + "330", + "600", + "330", + "600", + "330", + "600", + "330", + "600" + ], + "sparse_infill_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "internal_solid_infill_speed": [ + "280", + "600", + "280", + "600", + "280", + "600", + "280", + "600" + ], + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json index 92bebf6219..4cc91537ee 100644 --- a/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.30 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.30 Standard Snapmaker U1 (0.6 nozzle);0.30 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.30 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.30_nozzle_0.6", "from": "system", "setting_id": "TWxp6qgz1DJa8Ngo", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "68", @@ -22,8 +32,77 @@ "wipe_tower_wall_type": "rib", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json index f268a92446..fe96840a26 100644 --- a/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.30 Strength @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.30 Strength @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.30 Strength Snapmaker U1 (0.6 nozzle);0.30 Strength @Snapmaker U1 (0.6 High Flow nozzle);0.30 Strength Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.30_nozzle_0.6", "from": "system", "setting_id": "CBaL0vgwtgsd6Snj", @@ -14,7 +15,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_width": "30", "prime_volume": "68", "seam_gap": "15%", @@ -24,8 +34,77 @@ "ooze_prevention": "1", "precise_outer_wall": "1", "prime_tower_brim_width": "5", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_type": "tree(auto)", - "wipe_tower_extra_spacing": "120%" + "wipe_tower_extra_spacing": "120%", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json index de7559f827..4804264bba 100644 --- a/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.32 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.32 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.32 Standard Snapmaker U1 (0.8 nozzle);0.32 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.32 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.32_nozzle_0.8", "from": "system", "setting_id": "iVRz2B0VBIBL1xVd", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "72", @@ -25,8 +35,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json index 6dc9f26329..b8231f6dd1 100644 --- a/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.36 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.36 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.36 Standard Snapmaker U1 (0.6 nozzle);0.36 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.36 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.36_nozzle_0.6", "from": "system", "setting_id": "C0PiCFd3P222knX9", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "81", @@ -23,8 +33,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json index b18e30c210..4adde29f4b 100644 --- a/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.40 Extra Draft @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40 Extra Draft @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.40 Extra Draft Snapmaker U1 (0.6 nozzle);0.40 Extra Draft @Snapmaker U1 (0.6 High Flow nozzle);0.40 Extra Draft Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.6_common", "from": "system", "setting_id": "rAUffOThYmj9FVTw", @@ -13,7 +14,16 @@ "ooze_prevention": "1", "prime_tower_width": "30", "prime_volume": "90", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "wipe_tower_filament": "0", "preheat_time": "30", @@ -22,9 +32,65 @@ "initial_layer_print_height": "0.35", "top_shell_layers": "3", "bottom_shell_layers": "3", - "outer_wall_speed": "220", - "inner_wall_speed": "330", - "sparse_infill_speed": "320", - "internal_solid_infill_speed": "300", - "wall_loops": "2" + "outer_wall_speed": [ + "220", + "500", + "220", + "500", + "220", + "500", + "220", + "500" + ], + "inner_wall_speed": [ + "330", + "600", + "330", + "600", + "330", + "600", + "330", + "600" + ], + "sparse_infill_speed": [ + "320", + "600", + "320", + "600", + "320", + "600", + "320", + "600" + ], + "internal_solid_infill_speed": [ + "300", + "600", + "300", + "600", + "300", + "600", + "300", + "600" + ], + "wall_loops": "2", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ] } diff --git a/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json index b0cf935465..685c2395dc 100644 --- a/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.40 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.40 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.40 Standard Snapmaker U1 (0.8 nozzle);0.40 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.40 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.40_nozzle_0.8", "from": "system", "setting_id": "VqkPgUtZi159BKpJ", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "90", @@ -26,8 +36,77 @@ "min_width_top_surface": "200%", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "40", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json b/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json index eaa04faadc..3c6d1e38f5 100644 --- a/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.42 Standard @Snapmaker U1 (0.6 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.42 Standard @Snapmaker U1 (0.6 nozzle)", + "renamed_from": "0.42 Standard Snapmaker U1 (0.6 nozzle);0.42 Standard @Snapmaker U1 (0.6 High Flow nozzle);0.42 Standard Snapmaker U1 (0.6 High Flow nozzle)", "inherits": "fdm_process_U1_0.42_nozzle_0.6", "from": "system", "setting_id": "SVJzhQA3KQetRZmo", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "precise_z_height": "0", "prime_tower_brim_width": "5", "prime_tower_width": "30", @@ -23,8 +33,77 @@ "wipe_tower_wall_type": "rib", "enable_arc_fitting": "0", "ooze_prevention": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json index 599cf24db5..2447cad6c9 100644 --- a/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.48 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.48 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.48 Standard Snapmaker U1 (0.8 nozzle);0.48 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.48 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.48_nozzle_0.8", "from": "system", "setting_id": "5H6JWChFEo3zqoHQ", @@ -12,7 +13,16 @@ ], "filter_out_gap_fill": "1", "gap_fill_target": "topbottom", - "internal_bridge_speed": "100%", + "internal_bridge_speed": [ + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%", + "100%" + ], "prime_tower_brim_width": "5", "prime_tower_width": "30", "prime_volume": "108", @@ -23,8 +33,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json b/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json index ca728fe66a..aea4a4b78c 100644 --- a/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json +++ b/resources/profiles/Snapmaker/process/0.56 Standard @Snapmaker U1 (0.8 nozzle).json @@ -1,6 +1,7 @@ { "type": "process", "name": "0.56 Standard @Snapmaker U1 (0.8 nozzle)", + "renamed_from": "0.56 Standard Snapmaker U1 (0.8 nozzle);0.56 Standard @Snapmaker U1 (0.8 High Flow nozzle);0.56 Standard Snapmaker U1 (0.8 High Flow nozzle)", "inherits": "fdm_process_U1_0.56_nozzle_0.8", "from": "system", "setting_id": "JZEIXOUT33c7MrZj", @@ -22,8 +23,77 @@ "enable_arc_fitting": "0", "ooze_prevention": "1", "precise_outer_wall": "1", - "slowdown_for_curled_perimeters": "0", + "slowdown_for_curled_perimeters": [ + "0", + "0", + "0", + "0", + "0", + "0", + "0", + "0" + ], "standby_temperature_delta": "-150", "support_threshold_angle": "35", - "support_type": "tree(auto)" + "support_type": "tree(auto)", + "print_extruder_id": [ + "1", + "1", + "2", + "2", + "3", + "3", + "4", + "4" + ], + "print_extruder_variant": [ + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow", + "Direct Drive Standard", + "Direct Drive High Flow" + ], + "internal_solid_infill_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "inner_wall_speed": [ + "150", + "600", + "150", + "600", + "150", + "600", + "150", + "600" + ], + "sparse_infill_speed": [ + "100", + "600", + "100", + "600", + "100", + "600", + "100", + "600" + ], + "outer_wall_speed": [ + "120", + "500", + "120", + "500", + "120", + "500", + "120", + "500" + ] } diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh index c4433df04d..5d2bd2b31d 100755 --- a/scripts/run_unit_tests.sh +++ b/scripts/run_unit_tests.sh @@ -53,12 +53,12 @@ python_exe="$(find "${find_args[@]}" -print -quit 2>/dev/null)" if [ -z "${python_exe}" ]; then numpy_unavailable "no bundled Python under ${TEST_DIR}" elif ! has_pinned_numpy; then + # Git Bash resolves this to uv.exe on Windows. Never fall back to a uv on PATH: + # the app only runs its bundled uv, so the tests must too. uv_exe="${python_exe%/python/*}/tools/uv/uv" - # Builds that bundle no uv (Windows arm64) fall back to one on PATH. - [ -x "${uv_exe}" ] || uv_exe="$(command -v uv)" echo "Installing numpy ${NUMPY_VERSION} into the embedded test interpreter (${python_exe})..." - if [ -z "${uv_exe}" ]; then - numpy_unavailable "no uv staged beside the tests or on PATH" + if [ ! -x "${uv_exe}" ]; then + numpy_unavailable "no uv staged beside the tests" elif ! "${uv_exe}" pip install --python "${python_exe}" --only-binary :all: "numpy==${NUMPY_VERSION}" \ || ! has_pinned_numpy; then numpy_unavailable "could not install numpy ${NUMPY_VERSION} into ${python_exe}" diff --git a/scripts/test_build_win.ps1 b/scripts/test_build_win.ps1 index 65dec8ffa1..5f36fb7ac9 100644 --- a/scripts/test_build_win.ps1 +++ b/scripts/test_build_win.ps1 @@ -552,13 +552,6 @@ $cases = @( Contains = @('id=Microsoft.VisualStudio.2022.BuildTools') } @{ Name = '-l adds the clang compiler and the MSBuild toolset'; Args = @('-u', '--install-vs', 'buildtools', '-l') Contains = @('VC.Llvm.Clang ', 'VC.Llvm.ClangToolset') } - # CMake 4.x breaks Boost.Context on ARM64, so the installer pins 3.31 there - # and leaves x64 on the current release. - @{ Name = 'CMake is pinned to 3.31 when installing for arm64'; Args = @('-u', '--arch', 'arm64') - Contains = @('Kitware.CMake --version 3.31.8') } - @{ Name = 'CMake is not pinned for x64'; Args = @('-u', '--arch', 'x64') - Contains = @('Kitware.CMake') - NotContains = @('--version') } @{ Name = 'installing for arm64 asks for the ARM64 toolset'; Args = @('--install-vs', 'buildtools', '--arch', 'arm64') Contains = @('Microsoft.VisualStudio.Component.VC.Tools.ARM64') } @{ Name = 'an x64 install asks only for the x64 toolset'; Args = @('--install-vs', 'buildtools') diff --git a/src/libslic3r/MultiMaterialSegmentation.cpp b/src/libslic3r/MultiMaterialSegmentation.cpp index 6f80f7b759..464740768d 100644 --- a/src/libslic3r/MultiMaterialSegmentation.cpp +++ b/src/libslic3r/MultiMaterialSegmentation.cpp @@ -636,6 +636,8 @@ static std::vector> get_segments(const ColoredLines &p return segments; } + + static std::vector filter_painted_lines(const Line &line_to_process, const size_t start_idx, const size_t end_idx, const std::vector &painted_lines) { const int filter_eps_value = scale_(0.1f); @@ -688,15 +690,29 @@ static std::vector> post_process_painted_lines(const st if (painted_lines.empty()) return {}; + // The painted lines were appended by parallel workers, so their order is arbitrary. The sort must + // therefore be a total order: two projections of the same span from facets of different colours + // tie on every geometric key, and whichever sorts first wins the span in filter_painted_lines(). + // The colour and the end points break such ties so the result does not depend on scheduling. auto comp = [&contours](const PaintedLine &first, const PaintedLine &second) { - Point first_start_p = contours[first.contour_idx].segment_start(first.line_idx); - return first.contour_idx < second.contour_idx || - (first.contour_idx == second.contour_idx && - (first.line_idx < second.line_idx || - (first.line_idx == second.line_idx && - ((first.projected_line.a - first_start_p).cast().squaredNorm() < (second.projected_line.a - first_start_p).cast().squaredNorm() || - ((first.projected_line.a - first_start_p).cast().squaredNorm() == (second.projected_line.a - first_start_p).cast().squaredNorm() && - (first.projected_line.b - first.projected_line.a).cast().squaredNorm() < (second.projected_line.b - second.projected_line.a).cast().squaredNorm()))))); + if (first.contour_idx != second.contour_idx) + return first.contour_idx < second.contour_idx; + if (first.line_idx != second.line_idx) + return first.line_idx < second.line_idx; + const Point start_p = contours[first.contour_idx].segment_start(first.line_idx); + const double first_dist = (first.projected_line.a - start_p).cast().squaredNorm(); + const double second_dist = (second.projected_line.a - start_p).cast().squaredNorm(); + if (first_dist != second_dist) + return first_dist < second_dist; + const double first_len = (first.projected_line.b - first.projected_line.a).cast().squaredNorm(); + const double second_len = (second.projected_line.b - second.projected_line.a).cast().squaredNorm(); + if (first_len != second_len) + return first_len < second_len; + if (first.color != second.color) + return first.color < second.color; + if (first.projected_line.a != second.projected_line.a) + return first.projected_line.a < second.projected_line.a; + return first.projected_line.b < second.projected_line.b; }; std::sort(painted_lines.begin(), painted_lines.end(), comp); @@ -1200,15 +1216,12 @@ static inline std::vector> segmentation_top_and_bottom_l const size_t num_layers = input_expolygons.size(); const ConstLayerPtrsAdaptor layers = print_object.layers(); - // Maximum number of top / bottom layers accounts for maximum overlap of one thread group into a neighbor thread group. int max_top_layers = 0; int max_bottom_layers = 0; - int granularity = 1; for (size_t i = 0; i < print_object.num_printing_regions(); ++ i) { const PrintRegionConfig &config = print_object.printing_region(i).config(); max_top_layers = std::max(max_top_layers, config.top_shell_layers.value); max_bottom_layers = std::max(max_bottom_layers, config.bottom_shell_layers.value); - granularity = std::max(granularity, std::max(config.top_shell_layers.value, config.bottom_shell_layers.value) - 1); } // Project upwards pointing painted triangles over top surfaces, @@ -1327,14 +1340,16 @@ static inline std::vector> segmentation_top_and_bottom_l std::vector> triangles_by_color_bottom(num_facets_states); std::vector> triangles_by_color_top(num_facets_states); - triangles_by_color_bottom.assign(num_facets_states, std::vector(num_layers * 2)); - triangles_by_color_top.assign(num_facets_states, std::vector(num_layers * 2)); + triangles_by_color_bottom.assign(num_facets_states, std::vector(num_layers)); + triangles_by_color_top.assign(num_facets_states, std::vector(num_layers)); - // BBS: use shell_triangles_by_color_bottom & shell_triangles_by_color_top to save the top and bottom embedded layers's color information - std::vector> shell_triangles_by_color_bottom(num_facets_states); - std::vector> shell_triangles_by_color_top(num_facets_states); - shell_triangles_by_color_bottom.assign(num_facets_states, std::vector(num_layers * 2)); - shell_triangles_by_color_top.assign(num_facets_states, std::vector(num_layers * 2)); + // BBS: the painted top / bottom surfaces are also projected onto the shell layers below / above them. + // Each layer only writes the projections it produced, keyed by the layer they land on, so the + // parallel loop shares nothing; they are gathered per target layer afterwards, in source-layer + // order, which keeps the result independent of how the layers were scheduled. + using ShellProjections = std::vector>; // (target layer, projection) + std::vector> shell_triangles_by_color_bottom(num_facets_states, std::vector(num_layers)); + std::vector> shell_triangles_by_color_top(num_facets_states, std::vector(num_layers)); struct LayerColorStat { // Number of regions for a queried color. @@ -1378,11 +1393,9 @@ static inline std::vector> segmentation_top_and_bottom_l return out; }; - tbb::parallel_for(tbb::blocked_range(0, num_layers, granularity), [&granularity, &num_layers, &num_facets_states, &layer_color_stat, &top_raw, &triangles_by_color_top, - &throw_on_cancel_callback, &input_expolygons, &bottom_raw, &triangles_by_color_bottom, - &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range &range) { - size_t group_idx = range.begin() / granularity; - size_t layer_idx_offset = (group_idx & 1) * num_layers; + tbb::parallel_for(tbb::blocked_range(0, num_layers), [&num_layers, &num_facets_states, &layer_color_stat, &top_raw, &triangles_by_color_top, + &throw_on_cancel_callback, &input_expolygons, &bottom_raw, &triangles_by_color_bottom, + &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range &range) { for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) { for (size_t color_idx = 0; color_idx < num_facets_states; ++color_idx) { throw_on_cancel_callback(); @@ -1392,7 +1405,7 @@ static inline std::vector> segmentation_top_and_bottom_l // Clean up thin projections. They are not printable anyways. top_ex = opening_ex(top_ex, stat.small_region_threshold); if (! top_ex.empty()) { - append(triangles_by_color_top[color_idx][layer_idx + layer_idx_offset], top_ex); + append(triangles_by_color_top[color_idx][layer_idx], top_ex); float offset = 0.f; ExPolygons layer_slices_trimmed = input_expolygons[layer_idx]; for (int last_idx = int(layer_idx) - 1; last_idx > std::max(int(layer_idx - stat.top_shell_layers), int(0)); --last_idx) { @@ -1403,7 +1416,7 @@ static inline std::vector> segmentation_top_and_bottom_l ExPolygons last = opening_ex(intersection_ex(top_ex, offset_ex(layer_slices_trimmed, offset)), stat.small_region_threshold); if (last.empty()) break; - append(shell_triangles_by_color_top[color_idx][last_idx + layer_idx_offset], std::move(last)); + shell_triangles_by_color_top[color_idx][layer_idx].emplace_back(size_t(last_idx), std::move(last)); } } } @@ -1412,7 +1425,7 @@ static inline std::vector> segmentation_top_and_bottom_l // Clean up thin projections. They are not printable anyways. bottom_ex = opening_ex(bottom_ex, stat.small_region_threshold); if (! bottom_ex.empty()) { - append(triangles_by_color_bottom[color_idx][layer_idx + layer_idx_offset], bottom_ex); + append(triangles_by_color_bottom[color_idx][layer_idx], bottom_ex); float offset = 0.f; ExPolygons layer_slices_trimmed = input_expolygons[layer_idx]; for (size_t last_idx = layer_idx + 1; last_idx < std::min(layer_idx + stat.bottom_shell_layers, num_layers); ++last_idx) { @@ -1423,7 +1436,7 @@ static inline std::vector> segmentation_top_and_bottom_l ExPolygons last = opening_ex(intersection_ex(bottom_ex, offset_ex(layer_slices_trimmed, offset)), stat.small_region_threshold); if (last.empty()) break; - append(shell_triangles_by_color_bottom[color_idx][last_idx + layer_idx_offset], std::move(last)); + shell_triangles_by_color_bottom[color_idx][layer_idx].emplace_back(last_idx, std::move(last)); } } } @@ -1431,19 +1444,28 @@ static inline std::vector> segmentation_top_and_bottom_l } }); + // Gather the shell projections per target layer, walking the source layers in order. + std::vector> shell_top_by_layer(num_facets_states, std::vector(num_layers)); + std::vector> shell_bottom_by_layer(num_facets_states, std::vector(num_layers)); + for (size_t color_idx = 0; color_idx < num_facets_states; ++color_idx) + for (size_t layer_idx = 0; layer_idx < num_layers; ++layer_idx) { + for (auto &[target, projection] : shell_triangles_by_color_top[color_idx][layer_idx]) + append(shell_top_by_layer[color_idx][target], std::move(projection)); + for (auto &[target, projection] : shell_triangles_by_color_bottom[color_idx][layer_idx]) + append(shell_bottom_by_layer[color_idx][target], std::move(projection)); + } + std::vector> triangles_by_color_merged(num_facets_states); triangles_by_color_merged.assign(num_facets_states, std::vector(num_layers)); - tbb::parallel_for(tbb::blocked_range(0, num_layers), [&triangles_by_color_merged, &triangles_by_color_bottom, &triangles_by_color_top, &num_layers, &throw_on_cancel_callback, - &shell_triangles_by_color_top, &shell_triangles_by_color_bottom](const tbb::blocked_range &range) { + tbb::parallel_for(tbb::blocked_range(0, num_layers), [&triangles_by_color_merged, &triangles_by_color_bottom, &triangles_by_color_top, &throw_on_cancel_callback, + &shell_top_by_layer, &shell_bottom_by_layer](const tbb::blocked_range &range) { for (size_t layer_idx = range.begin(); layer_idx < range.end(); ++ layer_idx) { throw_on_cancel_callback(); ExPolygons painted_exploys; for (size_t color_idx = 0; color_idx < triangles_by_color_merged.size(); ++color_idx) { auto &self = triangles_by_color_merged[color_idx][layer_idx]; append(self, std::move(triangles_by_color_bottom[color_idx][layer_idx])); - append(self, std::move(triangles_by_color_bottom[color_idx][layer_idx + num_layers])); append(self, std::move(triangles_by_color_top[color_idx][layer_idx])); - append(self, std::move(triangles_by_color_top[color_idx][layer_idx + num_layers])); self = union_ex(self); append(painted_exploys, self); @@ -1455,13 +1477,8 @@ static inline std::vector> segmentation_top_and_bottom_l for (size_t color_idx = 0; color_idx < triangles_by_color_merged.size(); ++color_idx) { auto &self = triangles_by_color_merged[color_idx][layer_idx]; - auto top_area = diff_ex(union_ex(shell_triangles_by_color_top[color_idx][layer_idx], - shell_triangles_by_color_top[color_idx][layer_idx + num_layers]), - painted_exploys); - - auto bottom_area = diff_ex(union_ex(shell_triangles_by_color_bottom[color_idx][layer_idx], - shell_triangles_by_color_bottom[color_idx][layer_idx + num_layers]), - painted_exploys); + auto top_area = diff_ex(union_ex(shell_top_by_layer[color_idx][layer_idx]), painted_exploys); + auto bottom_area = diff_ex(union_ex(shell_bottom_by_layer[color_idx][layer_idx]), painted_exploys); append(self, top_area); append(self, bottom_area); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index d4d0c90272..fbd72117cd 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -8,6 +8,7 @@ #include "format.hpp" #include "GCode/Thumbnails.hpp" +#include #include #include #include @@ -671,19 +672,46 @@ std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolume return variant_string; } +int find_variant_index(const std::string& variant, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based) +{ + const int count = int(variant_list.empty() ? variant_ids_1based.size() : variant_list.size()); + if (count == 0) + return 0; + auto same_id = [&](int index) { + return variant_id_1based < 0 || variant_ids_1based.empty() || (index < int(variant_ids_1based.size()) && variant_ids_1based[index] == variant_id_1based); + }; + for (int index = 0; index < int(variant_list.size()); ++index) + if (variant_list[index] == variant && same_id(index)) + return index; + // Without this variant, use the id's own first variant (usually Standard), not variant index 0, + // which belongs to the first filament or extruder. + for (int index = 0; index < count; ++index) + if (same_id(index)) + return index; + return -1; +} + +std::vector map_variant_indices(const std::vector& variants, const std::vector& ids, + const std::vector& from_variants, const std::vector& from_ids) +{ + const size_t count = variants.empty() ? ids.size() : variants.size(); + std::vector variant_index(count); + for (size_t index = 0; index < count; ++index) { + if (!ids.empty() && index >= ids.size()) { + variant_index[index] = -1; + continue; + } + variant_index[index] = find_variant_index(index < variants.size() ? variants[index] : std::string(), + ids.empty() ? -1 : ids[index], from_variants, from_ids); + } + return variant_index; +} + int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_type, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based) { assert(variant_list.size() == variant_ids_1based.size()); - std::string extruder_variant = get_extruder_variant_string(extruder_type, volume_type); - for (int index = 0; index < int(variant_list.size()); ++index) { - if (extruder_variant == variant_list[index] && variant_ids_1based[index] == variant_id_1based) { return index; } - } - // Without this variant, use the id's own first variant (usually Standard), not variant index 0, - // which belongs to the first filament or extruder. - for (int index = 0; index < int(variant_list.size()); ++index) { - if (variant_ids_1based[index] == variant_id_1based) { return index; } - } - return 0; + const int index = find_variant_index(get_extruder_variant_string(extruder_type, volume_type), variant_id_1based, variant_list, variant_ids_1based); + return std::max(index, 0); } std::set get_extruder_supported_nozzle_volume_types(const DynamicPrintConfig &printer_config, int extruder_id) @@ -10741,14 +10769,23 @@ void normalize_filament_values_to_variants(DynamicPrintConfig &config) const int filament_count = *std::max_element(self_index->values.begin(), self_index->values.end()); if (filament_count <= 0 || size_t(filament_count) >= self_index->size()) return; + // The values are one per filament, without variant strings, or a single value for all of them. The + // variant strings do not change today's mapping; they are passed so a rule that reads them applies here too. + const auto *variants = config.option("filament_extruder_variant"); + const std::vector variant_list = variants && variants->size() == self_index->size() ? variants->values : std::vector(); + std::vector filament_ids(filament_count); + std::iota(filament_ids.begin(), filament_ids.end(), 1); + const std::vector from_filaments = map_variant_indices(variant_list, self_index->values, {}, filament_ids); + const std::vector from_single = map_variant_indices(variant_list, self_index->values, {}, {}); for (const std::string &key : filament_options_with_variant) { auto *opt = dynamic_cast(config.option(key)); if (opt == nullptr || (opt->size() != size_t(filament_count) && opt->size() != 1)) continue; - std::unique_ptr per_filament(opt->clone()); - // set_at() takes the first value for a filament past the end of a single-value vector + const std::vector &variant_index = opt->size() == size_t(filament_count) ? from_filaments : from_single; + std::unique_ptr source(opt->clone()); + // -1 and a single-value source both resolve to the first value through get_at() for (size_t variant = 0; variant < self_index->size(); ++variant) - opt->set_at(per_filament.get(), variant, self_index->values[variant] - 1); + opt->set_at(source.get(), variant, variant_index[variant]); } } @@ -11582,8 +11619,14 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig& else variant_index.resize(1, 0); + // A parent variant the child does not list (the parent gained it after the child was saved, or the + // child lists none) takes the child's first variant of the same extruder, as slicing does. + // Left unmatched, the parent's value would silently replace the user's. if (target_variant_count == 0) { - variant_index[0] = 0; + // The child's one value belongs to the extruder of the parent's first variant. + if (cur_variant_count > 0) + variant_index = map_variant_indices(cur_extruder_variants, cur_extruder_ids, {}, + cur_extruder_ids.empty() ? std::vector() : std::vector{cur_extruder_ids[0]}); } else if ((cur_extruder_ids.size() > 0) && cur_variant_count != cur_extruder_ids.size()){ //should not happen @@ -11595,19 +11638,8 @@ void DynamicPrintConfig::update_diff_values_to_child_config(DynamicPrintConfig& BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << boost::format(" size of %1% = %2%, not equal to size of %3% = %4%") %extruder_variant_name %target_variant_count %extruder_id_name %target_extruder_ids.size(); } - else { - for (int i = 0; i < cur_variant_count; i++) - { - for (int j = 0; j < target_variant_count; j++) - { - if ((cur_extruder_variants[i] == target_extruder_variants[j]) - &&(cur_extruder_ids.empty() || (cur_extruder_ids[i] == target_extruder_ids[j]))) - { - variant_index[i] = j; - break; - } - } - } + else if (cur_variant_count > 0) { + variant_index = map_variant_indices(cur_extruder_variants, cur_extruder_ids, target_extruder_variants, target_extruder_ids); } const t_config_option_keys &keys = new_config.keys(); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 3430de96fb..b1c407e3b6 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -556,8 +556,19 @@ enum PrimeVolumeMode { extern std::string get_extruder_variant_string(ExtruderType extruder_type, NozzleVolumeType nozzle_volume_type); -// Base slot lookup: scans a variant list (paired with its 1-based extruder/filament ids) for the -// entry matching the given extruder/volume type and id. Returns 0 when no entry matches. +// The variant index a value is taken from: in a variant list paired with its 1-based extruder or +// filament ids, the variant with the same variant string and id, else that id's first variant, else -1. +// variant_id_1based < 0 or empty variant_ids_1based match any id. A list without variant strings has +// one variant per id, and one with neither variant strings nor ids has a single variant. +extern int find_variant_index(const std::string& variant, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based); +// find_variant_index for every variant of a list paired with its ids, into from_variants/from_ids. +// A variant past the end of a shorter id list has no id and gets -1. +extern std::vector map_variant_indices(const std::vector& variants, const std::vector& ids, + const std::vector& from_variants, const std::vector& from_ids); + +// Variant index lookup: scans a variant list (paired with its 1-based extruder/filament ids) for the +// entry matching the given extruder/volume type and id, as find_variant_index. Returns 0 when the id +// has no variant. extern int get_config_index_base(NozzleVolumeType volume_type, ExtruderType extruder_type, int variant_id_1based, const std::vector& variant_list, const std::vector& variant_ids_1based); static std::set get_valid_nozzle_volume_type() { diff --git a/src/libslic3r/TriangleMeshSlicer.cpp b/src/libslic3r/TriangleMeshSlicer.cpp index 4ff18165cb..a08ea6b55d 100644 --- a/src/libslic3r/TriangleMeshSlicer.cpp +++ b/src/libslic3r/TriangleMeshSlicer.cpp @@ -1062,6 +1062,23 @@ inline std::pair slice_slabs_make_lines( } } ); + // As in slice_make_lines(): the facet loop is parallel, so the per-slab line order depends on + // thread scheduling, and make_slab_loops() derives loop order and start vertices from it. + // Sort canonically; edge_type and flags only break ties, std::sort being unstable. + auto sort_canonically = [](std::vector &lines_per_slab) { + tbb::parallel_for(tbb::blocked_range(0, lines_per_slab.size()), + [&lines_per_slab](const tbb::blocked_range &range) { + for (size_t i = range.begin(); i < range.end(); ++ i) + std::sort(lines_per_slab[i].begin(), lines_per_slab[i].end(), [](const IntersectionLine &l, const IntersectionLine &r) { + return std::make_tuple(l.edge_a_id, l.edge_b_id, l.a_id, l.b_id, l.a.x(), l.a.y(), l.b.x(), l.b.y(), l.edge_type, l.flags) < + std::make_tuple(r.edge_a_id, r.edge_b_id, r.a_id, r.b_id, r.a.x(), r.a.y(), r.b.x(), r.b.y(), r.edge_type, r.flags); + }); + }); + }; + for (SlabLines *slab_lines : { &lines_top, &lines_bottom }) { + sort_canonically(slab_lines->at_slice); + sort_canonically(slab_lines->between_slices); + } return out; } diff --git a/src/slic3r/GUI/2DBed.cpp b/src/slic3r/GUI/2DBed.cpp index 9aadd26951..3257d05adc 100644 --- a/src/slic3r/GUI/2DBed.cpp +++ b/src/slic3r/GUI/2DBed.cpp @@ -4,7 +4,25 @@ #include "3DBed.hpp" #include "PartPlate.hpp" +#include +#include "libslic3r/Polyline.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "libslic3r/Color.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" #include +#include +#include +#include +#include +#include #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Geometry.hpp" diff --git a/src/slic3r/GUI/2DBed.hpp b/src/slic3r/GUI/2DBed.hpp index 9cd7b5ec8e..d0ee8689ba 100644 --- a/src/slic3r/GUI/2DBed.hpp +++ b/src/slic3r/GUI/2DBed.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_2DBed_hpp_ #define slic3r_2DBed_hpp_ +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Line.hpp" +#include #include #include "libslic3r/Config.hpp" #include "libslic3r/ExPolygon.hpp" diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp index 3d7db8eb32..6d14a4d77c 100644 --- a/src/slic3r/GUI/3DBed.cpp +++ b/src/slic3r/GUI/3DBed.cpp @@ -15,11 +15,27 @@ #include "Plater.hpp" #include "Camera.hpp" +#include +#include +#include #include #include #include #include +#include "slic3r/GUI/GLModel.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" #if BOOST_VERSION >= 107800 #include diff --git a/src/slic3r/GUI/3DBed.hpp b/src/slic3r/GUI/3DBed.hpp index e6335fba3a..66e4bc7d0a 100644 --- a/src/slic3r/GUI/3DBed.hpp +++ b/src/slic3r/GUI/3DBed.hpp @@ -8,8 +8,13 @@ #include "libslic3r/BuildVolume.hpp" #include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/BoundingBox.hpp" #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index d72407a77e..0ba85775bd 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -1,3 +1,7 @@ +#include +#include +#include +#include #include #include "3DScene.hpp" @@ -25,6 +29,30 @@ #include "libslic3r/Tesselate.hpp" #include "libslic3r/PrintConfig.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include "libslic3r/ObjectID.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GUI_ObjectList.hpp" +#include "libslic3r/Line.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/Exception.hpp" #include #include #include @@ -36,6 +64,9 @@ #include #include +#include +#include +#include #ifdef HAS_GLSAFE void glAssertRecentCallImpl(const char* file_name, unsigned int line, const char* function_name) diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index b70cb4f565..663979690f 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -16,8 +16,17 @@ #include "GLShader.hpp" #include "MeshUtils.hpp" +#include +#include +#include #include +#include +#include "libslic3r/BoundingBox.hpp" +#include #include +#include +#include +#include #ifndef NDEBUG #define HAS_GLSAFE diff --git a/src/slic3r/GUI/AMSDryControl.cpp b/src/slic3r/GUI/AMSDryControl.cpp index 17d7d62ad8..a45a5fb4fd 100644 --- a/src/slic3r/GUI/AMSDryControl.cpp +++ b/src/slic3r/GUI/AMSDryControl.cpp @@ -19,7 +19,38 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Preset.hpp" +#include #include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "libslic3r/Exception.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AMSDryControl.hpp b/src/slic3r/GUI/AMSDryControl.hpp index 6c5df86849..36f41fc026 100644 --- a/src/slic3r/GUI/AMSDryControl.hpp +++ b/src/slic3r/GUI/AMSDryControl.hpp @@ -9,7 +9,25 @@ #include "slic3r/GUI/I18N.hpp" // Orca: explicit _L() catalog include #include +#include +#include "libslic3r/PresetBundle.hpp" +#include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include //Previous defintions diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index edd1827f16..08e7d7a056 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -8,8 +8,48 @@ #include "I18N.hpp" #include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/calib.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "CalibUtils.hpp" #include "../Utils/ColorSpaceConvert.hpp" #include "EncodedFilament.hpp" diff --git a/src/slic3r/GUI/AMSMaterialsSetting.hpp b/src/slic3r/GUI/AMSMaterialsSetting.hpp index 4cfdde791d..79880a6ec5 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.hpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.hpp @@ -16,6 +16,21 @@ #include "Widgets/TextInput.hpp" #include "Widgets/HyperLink.hpp" #include "slic3r/Utils/CalibUtils.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #define AMS_MATERIALS_SETTING_DEF_COLOUR wxColour(255, 255, 255) #define AMS_MATERIALS_SETTING_GREY900 wxColour(38, 46, 48) diff --git a/src/slic3r/GUI/AMSSetting.cpp b/src/slic3r/GUI/AMSSetting.cpp index 9ba9031f19..d967fa37ab 100644 --- a/src/slic3r/GUI/AMSSetting.cpp +++ b/src/slic3r/GUI/AMSSetting.cpp @@ -2,6 +2,7 @@ #include "GUI_App.hpp" #include "I18N.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" #include "slic3r/GUI/DeviceCore/DevFilaSystem.h" #include "slic3r/GUI/DeviceCore/DevManager.h" @@ -11,6 +12,18 @@ #include "slic3r/GUI/Widgets/AnimaController.hpp" #include "slic3r/GUI/Widgets/Label.hpp" #include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AMSSetting.hpp b/src/slic3r/GUI/AMSSetting.hpp index e157c947ae..24467f8d13 100644 --- a/src/slic3r/GUI/AMSSetting.hpp +++ b/src/slic3r/GUI/AMSSetting.hpp @@ -12,6 +12,15 @@ #include "Widgets/CheckBox.hpp" #include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define AMS_SETTING_DEF_COLOUR wxColour(255, 255, 255) #define AMS_SETTING_GREY800 wxColour(50, 58, 61) diff --git a/src/slic3r/GUI/AVVideoDecoder.cpp b/src/slic3r/GUI/AVVideoDecoder.cpp index 76965fedef..c89676d0a6 100644 --- a/src/slic3r/GUI/AVVideoDecoder.cpp +++ b/src/slic3r/GUI/AVVideoDecoder.cpp @@ -1,6 +1,14 @@ #include "AVVideoDecoder.hpp" +#include #include +#include "slic3r/GUI/Printer/BambuTunnel.h" +#include +#include +#include +#include +#include +#include extern "C" { diff --git a/src/slic3r/GUI/AVVideoDecoder.hpp b/src/slic3r/GUI/AVVideoDecoder.hpp index d3d16a11c1..2e3a7ab616 100644 --- a/src/slic3r/GUI/AVVideoDecoder.hpp +++ b/src/slic3r/GUI/AVVideoDecoder.hpp @@ -2,6 +2,7 @@ #define AVVIDEODECODER_HPP #include "Printer/BambuTunnel.h" +#include extern "C" { #include diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index 9e1cefbc84..d8fe67f97d 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -9,8 +9,26 @@ #include "MainFrame.hpp" #include "format.hpp" #include "Widgets/Button.hpp" +#include "libslic3r_version.h" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/AboutDialog.hpp b/src/slic3r/GUI/AboutDialog.hpp index e96c74ba08..61ccb4bc72 100644 --- a/src/slic3r/GUI/AboutDialog.hpp +++ b/src/slic3r/GUI/AboutDialog.hpp @@ -1,6 +1,11 @@ #ifndef slic3r_GUI_AboutDialog_hpp_ #define slic3r_GUI_AboutDialog_hpp_ +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/ActionRegistry.cpp b/src/slic3r/GUI/ActionRegistry.cpp index 6dd9b0b542..9d70bdb934 100644 --- a/src/slic3r/GUI/ActionRegistry.cpp +++ b/src/slic3r/GUI/ActionRegistry.cpp @@ -12,10 +12,19 @@ #include "Tab.hpp" #include "slic3r/plugin/PluginManager.hpp" +#include +#include #include #include +#include "slic3r/plugin/PluginDescriptor.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/PartPlate.hpp" #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 32a580845d..b1d5f7948e 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -11,6 +11,36 @@ #include "MainFrame.hpp" #include "format.hpp" #include "Widgets/ProgressDialog.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevUtil.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include #include #include "Widgets/RoundedRectangle.hpp" #include "Widgets/StaticBox.hpp" @@ -23,6 +53,9 @@ #include #include #include +#include +#include +#include #include "Plater.hpp" #include "BitmapCache.hpp" #include "BindDialog.hpp" diff --git a/src/slic3r/GUI/AmsMappingPopup.hpp b/src/slic3r/GUI/AmsMappingPopup.hpp index 21a3e38080..f86b2a4497 100644 --- a/src/slic3r/GUI/AmsMappingPopup.hpp +++ b/src/slic3r/GUI/AmsMappingPopup.hpp @@ -1,6 +1,16 @@ #ifndef slic3r_GUI_AmsMappingPopup_hpp_ #define slic3r_GUI_AmsMappingPopup_hpp_ +#include +#include +#include +#include +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp index 3e2853ad1a..4aed4e6545 100644 --- a/src/slic3r/GUI/AmsMappingPopupUpdate.cpp +++ b/src/slic3r/GUI/AmsMappingPopupUpdate.cpp @@ -21,6 +21,17 @@ #include "Widgets/RoundedRectangle.hpp" #include "Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include #include #include #include @@ -28,6 +39,7 @@ #include #include #include +#include #include "Plater.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/AmsWidgets.cpp b/src/slic3r/GUI/AmsWidgets.cpp index 86014d31e9..effbbaabc7 100644 --- a/src/slic3r/GUI/AmsWidgets.cpp +++ b/src/slic3r/GUI/AmsWidgets.cpp @@ -1,7 +1,10 @@ #include "AmsWidgets.hpp" +#include +#include #include #include #include +#include #include "GUI_App.hpp" #include "GUI_ObjectList.hpp" diff --git a/src/slic3r/GUI/AmsWidgets.hpp b/src/slic3r/GUI/AmsWidgets.hpp index 4f5bc592d2..24f3f781b2 100644 --- a/src/slic3r/GUI/AmsWidgets.hpp +++ b/src/slic3r/GUI/AmsWidgets.hpp @@ -2,6 +2,7 @@ #define slic3r_AmsWidgets_hpp_ +#include #include #include #include @@ -10,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/AuiPaneLayout.cpp b/src/slic3r/GUI/AuiPaneLayout.cpp index dc93352971..8bd8cd3f5f 100644 --- a/src/slic3r/GUI/AuiPaneLayout.cpp +++ b/src/slic3r/GUI/AuiPaneLayout.cpp @@ -1,4 +1,6 @@ #include "AuiPaneLayout.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index 67998b59d9..956417016c 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -4,17 +4,53 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Project.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/Tabbook.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/Widgets/ComboBox.hpp" #include +#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include +#include #include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/Auxiliary.hpp b/src/slic3r/GUI/Auxiliary.hpp index 76e6adf97b..442d4d0718 100644 --- a/src/slic3r/GUI/Auxiliary.hpp +++ b/src/slic3r/GUI/Auxiliary.hpp @@ -2,6 +2,16 @@ #define slic3r_Auxiliary_hpp_ #include "Tabbook.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include #include @@ -10,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp index a4268c7044..832fab7d6f 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.cpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.cpp @@ -4,9 +4,22 @@ #include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include const static std::array s_default_folders = { _L("Model Pictures"), diff --git a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp index 76c046c5e0..3b7764f16d 100644 --- a/src/slic3r/GUI/AuxiliaryDataViewModel.hpp +++ b/src/slic3r/GUI/AuxiliaryDataViewModel.hpp @@ -9,6 +9,12 @@ #include "I18N.hpp" #include +#include +#include +#include +#include +#include +#include class AuxiliaryModelNode; WX_DEFINE_ARRAY_PTR(AuxiliaryModelNode*, AuxiliaryModelNodePtrArray); diff --git a/src/slic3r/GUI/AuxiliaryDialog.cpp b/src/slic3r/GUI/AuxiliaryDialog.cpp index 0fce2cc833..64c333146f 100644 --- a/src/slic3r/GUI/AuxiliaryDialog.cpp +++ b/src/slic3r/GUI/AuxiliaryDialog.cpp @@ -5,6 +5,11 @@ #include "libslic3r/Utils.hpp" #include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include namespace pt = boost::property_tree; typedef pt::ptree JSON; diff --git a/src/slic3r/GUI/BBLStatusBar.cpp b/src/slic3r/GUI/BBLStatusBar.cpp index 175e553dc1..37e1bcf9d3 100644 --- a/src/slic3r/GUI/BBLStatusBar.cpp +++ b/src/slic3r/GUI/BBLStatusBar.cpp @@ -1,5 +1,11 @@ #include "BBLStatusBar.hpp" +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarBind.cpp b/src/slic3r/GUI/BBLStatusBarBind.cpp index 73151266b2..c2da7f59ea 100644 --- a/src/slic3r/GUI/BBLStatusBarBind.cpp +++ b/src/slic3r/GUI/BBLStatusBarBind.cpp @@ -1,5 +1,10 @@ #include "BBLStatusBarBind.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarBind.hpp b/src/slic3r/GUI/BBLStatusBarBind.hpp index ce7a394576..f46dec4bcc 100644 --- a/src/slic3r/GUI/BBLStatusBarBind.hpp +++ b/src/slic3r/GUI/BBLStatusBarBind.hpp @@ -2,6 +2,7 @@ #define BBLStatusBarBind_HPP #include +#include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarPrint.cpp b/src/slic3r/GUI/BBLStatusBarPrint.cpp index 1eaf82bb45..88d33dcbdc 100644 --- a/src/slic3r/GUI/BBLStatusBarPrint.cpp +++ b/src/slic3r/GUI/BBLStatusBarPrint.cpp @@ -1,5 +1,15 @@ #include "BBLStatusBarPrint.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarPrint.hpp b/src/slic3r/GUI/BBLStatusBarPrint.hpp index 757dcf95bf..0622516791 100644 --- a/src/slic3r/GUI/BBLStatusBarPrint.hpp +++ b/src/slic3r/GUI/BBLStatusBarPrint.hpp @@ -1,7 +1,9 @@ #ifndef BBLStatusBarPrint_HPP #define BBLStatusBarPrint_HPP +#include #include +#include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarSend.cpp b/src/slic3r/GUI/BBLStatusBarSend.cpp index d6d38fd019..4ada6ac95a 100644 --- a/src/slic3r/GUI/BBLStatusBarSend.cpp +++ b/src/slic3r/GUI/BBLStatusBarSend.cpp @@ -1,5 +1,13 @@ #include "BBLStatusBarSend.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BBLStatusBarSend.hpp b/src/slic3r/GUI/BBLStatusBarSend.hpp index 2dd7851b1a..abe4bece3b 100644 --- a/src/slic3r/GUI/BBLStatusBarSend.hpp +++ b/src/slic3r/GUI/BBLStatusBarSend.hpp @@ -1,7 +1,9 @@ #ifndef BBLSTATUSBARSEND_HPP #define BBLSTATUSBARSEND_HPP +#include #include +#include #include #include diff --git a/src/slic3r/GUI/BBLTopbar.cpp b/src/slic3r/GUI/BBLTopbar.cpp index eb6f4bcb00..eeb8df79fa 100644 --- a/src/slic3r/GUI/BBLTopbar.cpp +++ b/src/slic3r/GUI/BBLTopbar.cpp @@ -2,7 +2,19 @@ #include "wx/artprov.h" #include "wx/aui/framemanager.h" #include "wx/display.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include #include +#include #include "I18N.hpp" #include "GUI_App.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/BBLTopbar.hpp b/src/slic3r/GUI/BBLTopbar.hpp index 2745490d00..db34d8dc80 100644 --- a/src/slic3r/GUI/BBLTopbar.hpp +++ b/src/slic3r/GUI/BBLTopbar.hpp @@ -7,6 +7,9 @@ #include "DeviceManager.hpp" #include +#include +#include +#include using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp index f795b41999..423f8b68b2 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp @@ -4,8 +4,26 @@ #include "MainFrame.hpp" #include "format.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include +#include #include +#include +#include +#include +#include +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Zipper.hpp" +#include +#include "libslic3r/PrintBase.hpp" +#include +#include +#include "libslic3r/Polygon.hpp" #include +#include #include #include @@ -36,6 +54,7 @@ #include "I18N.hpp" // #include "RemovableDriveManager.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/Plater.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.hpp b/src/slic3r/GUI/BackgroundSlicingProcess.hpp index 07d6b42df6..b1020cf4c9 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.hpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.hpp @@ -1,12 +1,21 @@ #ifndef slic3r_GUI_BackgroundSlicingProcess_hpp_ #define slic3r_GUI_BackgroundSlicingProcess_hpp_ +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include +#include #include #include #include #include +#include +#include #include #include "libslic3r/PrintBase.hpp" diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp index 918116d89b..81e0fb7baf 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp @@ -1,7 +1,14 @@ #include "BaseTransparentDPIFrame.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Event.hpp" #include +#include #include +#include #include #include #include @@ -14,6 +21,9 @@ #include "Widgets/TextInput.hpp" #include "Notebook.hpp" #include +#include +#include +#include #include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" #include "CapsuleButton.hpp" diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp index 7dc83b4d46..e63e23c079 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.hpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.hpp @@ -2,9 +2,13 @@ #define _BaseTransparentDPIFrame_H_ #include +#include "slic3r/GUI/Event.hpp" #include #include "GUI_App.hpp" #include "GUI_Utils.hpp" +#include +#include +#include #include class Button; diff --git a/src/slic3r/GUI/BedShapeDialog.cpp b/src/slic3r/GUI/BedShapeDialog.cpp index 6066fd5633..d8438e178a 100644 --- a/src/slic3r/GUI/BedShapeDialog.cpp +++ b/src/slic3r/GUI/BedShapeDialog.cpp @@ -2,6 +2,30 @@ #include "GUI_App.hpp" #include "OptionsGroup.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include "libslic3r/BuildVolume.hpp" +#include "slic3r/GUI/Field.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/2DBed.hpp" +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/BedShapeDialog.hpp b/src/slic3r/GUI/BedShapeDialog.hpp index 9b5cb1f2ae..78211d103b 100644 --- a/src/slic3r/GUI/BedShapeDialog.hpp +++ b/src/slic3r/GUI/BedShapeDialog.hpp @@ -11,8 +11,17 @@ #include "Widgets/ComboBox.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/Config.hpp" #include +#include +#include +#include #include // ORCA +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/BindDialog.cpp b/src/slic3r/GUI/BindDialog.cpp index 883765751b..c16bcf016d 100644 --- a/src/slic3r/GUI/BindDialog.cpp +++ b/src/slic3r/GUI/BindDialog.cpp @@ -1,10 +1,44 @@ #include "BindDialog.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include +#include "slic3r/GUI/BBLStatusBarBind.hpp" +#include "slic3r/GUI/Jobs/BindJob.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include +#include #include #include #include #include +#include "bambu_networking.hpp" +#include "Http.hpp" #include "wx/evtloop.h" #include #include diff --git a/src/slic3r/GUI/BindDialog.hpp b/src/slic3r/GUI/BindDialog.hpp index 8d21c1be5e..25df5c75ff 100644 --- a/src/slic3r/GUI/BindDialog.hpp +++ b/src/slic3r/GUI/BindDialog.hpp @@ -3,9 +3,16 @@ #include "I18N.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" #include #include +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/BitmapCache.cpp b/src/slic3r/GUI/BitmapCache.cpp index 6885c19297..4a52c3efab 100644 --- a/src/slic3r/GUI/BitmapCache.cpp +++ b/src/slic3r/GUI/BitmapCache.cpp @@ -5,8 +5,24 @@ #include "GUI.hpp" #include "GUI_Utils.hpp" +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include +#include +#include +#include #ifdef __WXGTK2__ // Broken alpha workaround diff --git a/src/slic3r/GUI/BitmapCache.hpp b/src/slic3r/GUI/BitmapCache.hpp index e2ebe75314..2f5efb061e 100644 --- a/src/slic3r/GUI/BitmapCache.hpp +++ b/src/slic3r/GUI/BitmapCache.hpp @@ -1,9 +1,12 @@ #ifndef SLIC3R_GUI_BITMAP_CACHE_HPP #define SLIC3R_GUI_BITMAP_CACHE_HPP +#include #include +#include #include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/BitmapComboBox.cpp b/src/slic3r/GUI/BitmapComboBox.cpp index c7911f4864..217b885b91 100644 --- a/src/slic3r/GUI/BitmapComboBox.cpp +++ b/src/slic3r/GUI/BitmapComboBox.cpp @@ -5,6 +5,8 @@ #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/BitmapComboBox.hpp b/src/slic3r/GUI/BitmapComboBox.hpp index 14e7e74c93..8b3d1f0f1d 100644 --- a/src/slic3r/GUI/BitmapComboBox.hpp +++ b/src/slic3r/GUI/BitmapComboBox.hpp @@ -1,8 +1,10 @@ #ifndef slic3r_BitmapComboBox_hpp_ #define slic3r_BitmapComboBox_hpp_ +#include #include #include +#include #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/BonjourDialog.cpp b/src/slic3r/GUI/BonjourDialog.cpp index 8b3217e193..566441c64f 100644 --- a/src/slic3r/GUI/BonjourDialog.cpp +++ b/src/slic3r/GUI/BonjourDialog.cpp @@ -2,15 +2,27 @@ #include "BonjourDialog.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include #include #include #include +#include #include #include "slic3r/GUI/GUI.hpp" diff --git a/src/slic3r/GUI/BonjourDialog.hpp b/src/slic3r/GUI/BonjourDialog.hpp index 8bfc076c44..2af82f8410 100644 --- a/src/slic3r/GUI/BonjourDialog.hpp +++ b/src/slic3r/GUI/BonjourDialog.hpp @@ -2,11 +2,14 @@ #define slic3r_BonjourDialog_hpp_ #include +#include "libslic3r/Config.hpp" #include #include +#include #include +#include #include #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/CAD/DesignCanvas.cpp b/src/slic3r/GUI/CAD/DesignCanvas.cpp index 8db2afbbc2..517fbcee63 100644 --- a/src/slic3r/GUI/CAD/DesignCanvas.cpp +++ b/src/slic3r/GUI/CAD/DesignCanvas.cpp @@ -15,14 +15,32 @@ #include "libslic3r/Config.hpp" #include #include +#include #include +#include +#include +#include "libslic3r/CAD/SketchEngine.hpp" +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/CAD/DesignSketchTool.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/CAD/CadDocument.hpp" +#include "libslic3r/BoundingBox.hpp" #include +#include #include // wxGetLocalTimeMillis: the right-click vs right-hold budget #include #include #include +#include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CAD/DesignCanvas.hpp b/src/slic3r/GUI/CAD/DesignCanvas.hpp index fab2e556e3..3f87eb434b 100644 --- a/src/slic3r/GUI/CAD/DesignCanvas.hpp +++ b/src/slic3r/GUI/CAD/DesignCanvas.hpp @@ -1,12 +1,20 @@ #ifndef slic3r_DesignCanvas_hpp_ #define slic3r_DesignCanvas_hpp_ +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/CAD/CadDocument.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include #include #include #include #include #include +#include #include "slic3r/GUI/3DBed.hpp" #include "slic3r/GUI/Camera.hpp" diff --git a/src/slic3r/GUI/CAD/DesignPanel.cpp b/src/slic3r/GUI/CAD/DesignPanel.cpp index 5f64025f2b..59e3aaac8e 100644 --- a/src/slic3r/GUI/CAD/DesignPanel.cpp +++ b/src/slic3r/GUI/CAD/DesignPanel.cpp @@ -1,4 +1,5 @@ #include "slic3r/GUI/CAD/DesignPanel.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/CAD/DesignCanvas.hpp" #include "slic3r/GUI/CAD/DesignSketchTool.hpp" #include "slic3r/GUI/CAD/DesignOffer.hpp" // generated offer table — see scripts/CAD/tool_atlas.json @@ -7,6 +8,11 @@ #include "libslic3r/Format/OBJ.hpp" #include "libslic3r/Format/bbs_3mf.hpp" // put_other_changes: mark the project dirty outside the undo stack +#include +#include +#include +#include +#include #include #include #include // the offer/atlas join check reports on the log @@ -14,15 +20,45 @@ #include #include // offer_trace: diagnostic row dump for the offer ladder +#include +#include +#include +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/CAD/CadDocument.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/CAD/SketchSolver.hpp" #include +#include #include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/CAD/DesignInteraction.hpp" #include #include +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -35,6 +71,7 @@ #include #include #include +#include #include // wxWindowDisabler, wxMilliSleep #include // wxMessageBox @@ -45,6 +82,7 @@ #include #include #include +#include #include "slic3r/GUI/wxExtensions.hpp" // ScalableButton, create_scaled_bitmap #include "slic3r/GUI/Widgets/Label.hpp" // HarmonyOS Sans fonts (Head_*/Body_*) shared with the rest of Orca diff --git a/src/slic3r/GUI/CAD/DesignPanel.hpp b/src/slic3r/GUI/CAD/DesignPanel.hpp index 16f0a2722c..5197ea4bbf 100644 --- a/src/slic3r/GUI/CAD/DesignPanel.hpp +++ b/src/slic3r/GUI/CAD/DesignPanel.hpp @@ -1,8 +1,17 @@ #ifndef slic3r_DesignPanel_hpp_ #define slic3r_DesignPanel_hpp_ +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include +#include +#include #include #include +#include #include // wxTreeItemId #include diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.cpp b/src/slic3r/GUI/CAD/DesignSketchTool.cpp index c195d6a877..d4883b4ba6 100644 --- a/src/slic3r/GUI/CAD/DesignSketchTool.cpp +++ b/src/slic3r/GUI/CAD/DesignSketchTool.cpp @@ -5,6 +5,11 @@ #include "slic3r/GUI/CAD/SketchInlineEditor.hpp" #include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include +#include #include #include #include "libslic3r/BuildVolume.hpp" @@ -15,6 +20,19 @@ #include "libslic3r/TriangleMesh.hpp" #include +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/CAD/SketchSolver.hpp" +#include "libslic3r/Line.hpp" +#include +#include "libslic3r/CAD/SketchInference.hpp" +#include +#include "libslic3r/CAD/CadDocument.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/BoundingBox.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/CAD/DesignSketchTool.hpp b/src/slic3r/GUI/CAD/DesignSketchTool.hpp index c88b149c59..a68cfc2b88 100644 --- a/src/slic3r/GUI/CAD/DesignSketchTool.hpp +++ b/src/slic3r/GUI/CAD/DesignSketchTool.hpp @@ -8,7 +8,10 @@ #include "libslic3r/CAD/SketchSolver.hpp" #include "slic3r/GUI/GLModel.hpp" #include "slic3r/GUI/GLSelectionRectangle.hpp" // left-drag rubber band over the committed bodies +#include #include +#include "libslic3r/Color.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/CAD/McpControl.cpp b/src/slic3r/GUI/CAD/McpControl.cpp index 0ad05667c3..5ae67edbb2 100644 --- a/src/slic3r/GUI/CAD/McpControl.cpp +++ b/src/slic3r/GUI/CAD/McpControl.cpp @@ -1,4 +1,11 @@ #include "slic3r/GUI/CAD/McpControl.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include #ifndef _WIN32 // POSIX Unix-domain-socket transport only (slice 1) diff --git a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp index 8dfb939576..effb949f66 100644 --- a/src/slic3r/GUI/CAD/SketchInlineEditor.cpp +++ b/src/slic3r/GUI/CAD/SketchInlineEditor.cpp @@ -5,6 +5,7 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/Color.hpp" +#include #include #include // BringWindowToDisplayFront / GetCurrentWindow @@ -12,6 +13,8 @@ #include #include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CaliHistoryDialog.cpp b/src/slic3r/GUI/CaliHistoryDialog.cpp index 9b85e80c10..1c2c0b9217 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.cpp +++ b/src/slic3r/GUI/CaliHistoryDialog.cpp @@ -8,7 +8,38 @@ #include "MsgDialog.hpp" #include "slic3r/Utils/CalibUtils.hpp" #include "Widgets/DialogButtons.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "DeviceCore/DevExtruderSystem.h" diff --git a/src/slic3r/GUI/CaliHistoryDialog.hpp b/src/slic3r/GUI/CaliHistoryDialog.hpp index d5159b634c..c57c5abcf4 100644 --- a/src/slic3r/GUI/CaliHistoryDialog.hpp +++ b/src/slic3r/GUI/CaliHistoryDialog.hpp @@ -6,6 +6,16 @@ #include "Widgets/ComboBox.hpp" #include "Widgets/SwitchButton.hpp" #include "DeviceManager.hpp" +#include +#include "libslic3r/calib.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceErrorDialog.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Calibration.cpp b/src/slic3r/GUI/Calibration.cpp index f3351fdb6b..7c25d4adaa 100644 --- a/src/slic3r/GUI/Calibration.cpp +++ b/src/slic3r/GUI/Calibration.cpp @@ -12,6 +12,23 @@ #include "Widgets/StaticBox.hpp" #include "DeviceCore/DevConfig.h" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/Widgets/StepCtrl.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include static wxColour FG_COLOR = wxColour(0x32, 0x3A, 0x3D); static wxColour BG_COLOR = wxColour(0xF8, 0xF8, 0xF8); diff --git a/src/slic3r/GUI/Calibration.hpp b/src/slic3r/GUI/Calibration.hpp index 35e006c446..c5318f818b 100644 --- a/src/slic3r/GUI/Calibration.hpp +++ b/src/slic3r/GUI/Calibration.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_Calibration_hpp_ #define slic3r_GUI_Calibration_hpp_ +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/CalibrationPanel.cpp b/src/slic3r/GUI/CalibrationPanel.cpp index 14e1d5dea2..bd09d5fcf7 100644 --- a/src/slic3r/GUI/CalibrationPanel.cpp +++ b/src/slic3r/GUI/CalibrationPanel.cpp @@ -1,4 +1,33 @@ +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "libslic3r/Thread.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/SideTools.hpp" +#include +#include "slic3r/GUI/Tabbook.hpp" +#include +#include "slic3r/GUI/CalibrationWizard.hpp" +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/CalibrationWizardPresetPage.hpp" +#include "slic3r/GUI/CalibrationWizardSavePage.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GUI.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" diff --git a/src/slic3r/GUI/CalibrationPanel.hpp b/src/slic3r/GUI/CalibrationPanel.hpp index 960c5eed37..f427b37871 100644 --- a/src/slic3r/GUI/CalibrationPanel.hpp +++ b/src/slic3r/GUI/CalibrationPanel.hpp @@ -4,7 +4,8 @@ #include "CalibrationWizard.hpp" #include "Tabbook.hpp" #include "Lazy.hpp" -//#include "Widgets/SideTools.hpp" +#include "SelectMachinePop.hpp" +#include "Widgets/SideTools.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp index 4d6e694380..c1aa26aa98 100644 --- a/src/slic3r/GUI/CalibrationWizard.cpp +++ b/src/slic3r/GUI/CalibrationWizard.cpp @@ -1,4 +1,5 @@ #include "CalibrationWizard.hpp" +#include "CalibUtils.hpp" #include "I18N.hpp" #include "GUI_App.hpp" #include "slic3r/Utils/NetworkAgent.hpp" @@ -7,6 +8,34 @@ #include "../../libslic3r/calib.hpp" #include "Tabbook.hpp" #include "CaliHistoryDialog.hpp" +#include +#include +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/CalibrationWizardPresetPage.hpp" +#include +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include "slic3r/GUI/CalibrationWizardStartPage.hpp" +#include "slic3r/GUI/CalibrationWizardCaliPage.hpp" +#include "slic3r/GUI/CalibrationWizardSavePage.hpp" +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/ParameterUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizard.hpp b/src/slic3r/GUI/CalibrationWizard.hpp index 89c515eb80..86f876be55 100644 --- a/src/slic3r/GUI/CalibrationWizard.hpp +++ b/src/slic3r/GUI/CalibrationWizard.hpp @@ -10,6 +10,20 @@ #include "CalibrationWizardCaliPage.hpp" #include "CalibrationWizardSavePage.hpp" #include "StagedBuild.hpp" +#include +#include "libslic3r/calib.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ReleaseNote.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp index 2dc766dca3..babc7e959f 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.cpp @@ -1,9 +1,27 @@ #include "CalibrationWizardCaliPage.hpp" +#include "CalibUtils.hpp" #include "MainFrame.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" #include "DeviceCore/DevManager.h" +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/StatusPanel.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Utils.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardCaliPage.hpp b/src/slic3r/GUI/CalibrationWizardCaliPage.hpp index b3ff01c2dc..b87ac0e5fd 100644 --- a/src/slic3r/GUI/CalibrationWizardCaliPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardCaliPage.hpp @@ -3,6 +3,12 @@ #include "CalibrationWizardPage.hpp" #include "StatusPanel.hpp" +#include "libslic3r/calib.hpp" +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/ReleaseNote.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp index ff02feab68..0c4abb8070 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPage.cpp @@ -1,9 +1,35 @@ #include "CalibrationWizardPage.hpp" +#include "CalibUtils.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" #include "MsgDialog.hpp" #include "DeviceCore/DevFilaSystem.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/PresetComboBoxes.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPage.hpp b/src/slic3r/GUI/CalibrationWizardPage.hpp index 524b1a6029..8624d7c9f7 100644 --- a/src/slic3r/GUI/CalibrationWizardPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPage.hpp @@ -13,6 +13,20 @@ #include "slic3r/Utils/CalibUtils.hpp" #include "../../libslic3r/calib.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp index 01c9843305..e49ebfb787 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.cpp @@ -1,5 +1,43 @@ +#include "libslic3r/calib.hpp" +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/CommonDefs.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include "libslic3r/PresetBundle.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include #include "CalibrationWizardPresetPage.hpp" +#include "CalibUtils.hpp" #include "GUI.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp index 4d1adb1004..1ad2a2e1e1 100644 --- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp @@ -2,6 +2,30 @@ #define slic3r_GUI_CalibrationWizardPresetPage_hpp_ #include "CalibrationWizardPage.hpp" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index fdff760078..d39b39206c 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -1,4 +1,5 @@ #include "CalibrationWizardSavePage.hpp" +#include "CalibUtils.hpp" #include "GUI.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" @@ -6,6 +7,34 @@ #include "DeviceCore/DevConfigUtil.h" #include "DeviceCore/DevNozzleSystem.h" #include "DeviceCore/DevNozzleRack.h" +#include +#include "libslic3r/calib.hpp" +#include "libslic3r/PresetBundle.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.hpp b/src/slic3r/GUI/CalibrationWizardSavePage.hpp index eb15720e96..d29620ba4c 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.hpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.hpp @@ -3,6 +3,24 @@ #include "CalibrationWizardPage.hpp" #include "Widgets/TextInput.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.cpp b/src/slic3r/GUI/CalibrationWizardStartPage.cpp index 3ed24d184e..6fcfbb0aef 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.cpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.cpp @@ -1,6 +1,17 @@ #include "CalibrationWizardStartPage.hpp" #include "I18N.hpp" #include "Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CalibrationWizardStartPage.hpp b/src/slic3r/GUI/CalibrationWizardStartPage.hpp index 026ce187ac..d8b928fd16 100644 --- a/src/slic3r/GUI/CalibrationWizardStartPage.hpp +++ b/src/slic3r/GUI/CalibrationWizardStartPage.hpp @@ -2,6 +2,14 @@ #define slic3r_GUI_CalibrationWizardStartPage_hpp_ #include "CalibrationWizardPage.hpp" +#include +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Camera.cpp b/src/slic3r/GUI/Camera.cpp index 19e37feaaf..ff97505483 100644 --- a/src/slic3r/GUI/Camera.cpp +++ b/src/slic3r/GUI/Camera.cpp @@ -3,6 +3,21 @@ #include "Camera.hpp" #include "GUI_App.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Geometry.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include #if ENABLE_CAMERA_STATISTICS #include "Mouse3DController.hpp" #include "Plater.hpp" diff --git a/src/slic3r/GUI/Camera.hpp b/src/slic3r/GUI/Camera.hpp index 7835b84b58..5e8d6781e5 100644 --- a/src/slic3r/GUI/Camera.hpp +++ b/src/slic3r/GUI/Camera.hpp @@ -3,7 +3,16 @@ #include "libslic3r/BoundingBox.hpp" #include "3DScene.hpp" +#include +#include #include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/Technologies.hpp" +#include +#include "libslic3r/libslic3r.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CameraPopup.cpp b/src/slic3r/GUI/CameraPopup.cpp index 099edd7de0..299aaa85fc 100644 --- a/src/slic3r/GUI/CameraPopup.cpp +++ b/src/slic3r/GUI/CameraPopup.cpp @@ -4,9 +4,28 @@ #include "Widgets/Label.hpp" #include "libslic3r/Utils.hpp" #include "BitmapCache.hpp" +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/RadioBox.hpp" +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include #include #include "GUI_App.hpp" #include diff --git a/src/slic3r/GUI/CameraPopup.hpp b/src/slic3r/GUI/CameraPopup.hpp index c9b1540d3b..06580f6653 100644 --- a/src/slic3r/GUI/CameraPopup.hpp +++ b/src/slic3r/GUI/CameraPopup.hpp @@ -4,9 +4,18 @@ #include "slic3r/GUI/MonitorBasePanel.h" #include "DeviceManager.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceErrorDialog.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #include #include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/CameraUtils.cpp b/src/slic3r/GUI/CameraUtils.cpp index a14e99c9c5..ace1225394 100644 --- a/src/slic3r/GUI/CameraUtils.cpp +++ b/src/slic3r/GUI/CameraUtils.cpp @@ -1,6 +1,16 @@ #include "CameraUtils.hpp" +#include +#include +#include +#include #include // projecting points #include +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/Camera.hpp" +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include #include "slic3r/GUI/3DScene.hpp" // GLVolume #include "libslic3r/Geometry/ConvexHull.hpp" diff --git a/src/slic3r/GUI/CameraUtils.hpp b/src/slic3r/GUI/CameraUtils.hpp index 6e953bf6ee..2961629d0c 100644 --- a/src/slic3r/GUI/CameraUtils.hpp +++ b/src/slic3r/GUI/CameraUtils.hpp @@ -3,6 +3,8 @@ #include "Camera.hpp" #include "libslic3r/Point.hpp" +#include +#include "libslic3r/Polygon.hpp" namespace Slic3r { class GLVolume; } diff --git a/src/slic3r/GUI/CapsuleButton.cpp b/src/slic3r/GUI/CapsuleButton.cpp index 8d71f9911e..062dcd9c88 100644 --- a/src/slic3r/GUI/CapsuleButton.cpp +++ b/src/slic3r/GUI/CapsuleButton.cpp @@ -1,7 +1,15 @@ #include "GUI_App.hpp" #include "CapsuleButton.hpp" #include "Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" #include +#include +#include +#include +#include +#include +#include #include "wx/graphics.h" #include "Widgets/Label.hpp" diff --git a/src/slic3r/GUI/CapsuleButton.hpp b/src/slic3r/GUI/CapsuleButton.hpp index 7ec13f3e20..ac23f174e8 100644 --- a/src/slic3r/GUI/CapsuleButton.hpp +++ b/src/slic3r/GUI/CapsuleButton.hpp @@ -3,6 +3,10 @@ #include "wxExtensions.hpp" #include "Widgets/Label.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { class CapsuleButton : public wxPanel diff --git a/src/slic3r/GUI/CloneDialog.cpp b/src/slic3r/GUI/CloneDialog.cpp index 9024f0cb61..1c52b8cdb4 100644 --- a/src/slic3r/GUI/CloneDialog.cpp +++ b/src/slic3r/GUI/CloneDialog.cpp @@ -2,6 +2,24 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Selection.hpp" +#include +#include "slic3r/GUI/Jobs/Job.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/CloneDialog.hpp b/src/slic3r/GUI/CloneDialog.hpp index b15e0b9757..7d83b93d62 100644 --- a/src/slic3r/GUI/CloneDialog.hpp +++ b/src/slic3r/GUI/CloneDialog.hpp @@ -10,6 +10,7 @@ #include "Widgets/DialogButtons.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/ProgressBar.hpp" +#include "libslic3r/AppConfig.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ColorDecomposeDialog.cpp b/src/slic3r/GUI/ColorDecomposeDialog.cpp index 2176de110e..4a038affaa 100644 --- a/src/slic3r/GUI/ColorDecomposeDialog.cpp +++ b/src/slic3r/GUI/ColorDecomposeDialog.cpp @@ -2,12 +2,26 @@ #include #include +#include #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include #include #include #include +#include +#include +#include #include "wx/graphics.h" #include "I18N.hpp" diff --git a/src/slic3r/GUI/ColorDecomposeDialog.hpp b/src/slic3r/GUI/ColorDecomposeDialog.hpp index 419dfe8cea..6e5a602e2c 100644 --- a/src/slic3r/GUI/ColorDecomposeDialog.hpp +++ b/src/slic3r/GUI/ColorDecomposeDialog.hpp @@ -2,14 +2,17 @@ #define slic3r_ColorDecomposeDialog_hpp_ #include +#include #include #include #include #include #include #include +#include #include #include +#include #include "GUI_Utils.hpp" #include "libslic3r/ColorDecomposeRecipe.hpp" diff --git a/src/slic3r/GUI/ColorDecomposeSupport.cpp b/src/slic3r/GUI/ColorDecomposeSupport.cpp index cfd0d02532..35ba3ffeb8 100644 --- a/src/slic3r/GUI/ColorDecomposeSupport.cpp +++ b/src/slic3r/GUI/ColorDecomposeSupport.cpp @@ -10,9 +10,17 @@ #include "nlohmann/json.hpp" +#include #include #include #include +#include +#include "slic3r/GUI/ColorDecomposeDialog.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include +#include using json = nlohmann::json; diff --git a/src/slic3r/GUI/ColorDecomposeSupport.hpp b/src/slic3r/GUI/ColorDecomposeSupport.hpp index a982c51303..cc736fb3e2 100644 --- a/src/slic3r/GUI/ColorDecomposeSupport.hpp +++ b/src/slic3r/GUI/ColorDecomposeSupport.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_ColorDecomposeSupport_hpp_ #define slic3r_GUI_ColorDecomposeSupport_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 7b2bfe0352..91c5f211e1 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -14,7 +14,15 @@ #include "Plater.hpp" #include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Field.hpp" +#include +#include +#include #include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/ConfigManipulation.hpp b/src/slic3r/GUI/ConfigManipulation.hpp index 0ebf7d963a..8e189a541c 100644 --- a/src/slic3r/GUI/ConfigManipulation.hpp +++ b/src/slic3r/GUI/ConfigManipulation.hpp @@ -10,6 +10,13 @@ #include "libslic3r/PrintConfig.hpp" #include "Field.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ConfigValueFormatter.cpp b/src/slic3r/GUI/ConfigValueFormatter.cpp index 17cf902217..2ae515b0e2 100644 --- a/src/slic3r/GUI/ConfigValueFormatter.cpp +++ b/src/slic3r/GUI/ConfigValueFormatter.cpp @@ -1,12 +1,15 @@ #include "ConfigValueFormatter.hpp" #include +#include #include +#include "libslic3r/Point.hpp" #include #include #include #include +#include #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 7aaa0e7865..945e88cc45 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -1,9 +1,30 @@ // FIXME: extract absolute units -> em #include "ConfigWizard_private.hpp" +#include "libslic3r_version.h" #include +#include +#include +#include +#include +#include "libslic3r/Exception.hpp" +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/BedShapeDialog.hpp" +#include "slic3r/GUI/wxExtensions.hpp" #include #include #include @@ -12,8 +33,19 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include #include +#include #include #include #include @@ -24,6 +56,7 @@ #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp index f929a3aaa2..72f710b42b 100644 --- a/src/slic3r/GUI/ConfigWizard.hpp +++ b/src/slic3r/GUI/ConfigWizard.hpp @@ -4,6 +4,7 @@ #include #include +#include #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index 7b9674b216..c1371f5316 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -3,6 +3,14 @@ #include "ConfigWizard.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include #include #include #include @@ -10,11 +18,15 @@ #include #include +#include +#include +#include #include #include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/ConnectPrinter.cpp b/src/slic3r/GUI/ConnectPrinter.cpp index 8e3d58b413..5d7bf67e03 100644 --- a/src/slic3r/GUI/ConnectPrinter.cpp +++ b/src/slic3r/GUI/ConnectPrinter.cpp @@ -1,7 +1,18 @@ #include "ConnectPrinter.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" #include +#include "slic3r/GUI/Widgets/Button.hpp" #include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include "libslic3r/AppConfig.hpp" #include "DeviceCore/DevManager.h" diff --git a/src/slic3r/GUI/ConnectPrinter.hpp b/src/slic3r/GUI/ConnectPrinter.hpp index 95175a1ab0..5ce512512b 100644 --- a/src/slic3r/GUI/ConnectPrinter.hpp +++ b/src/slic3r/GUI/ConnectPrinter.hpp @@ -4,6 +4,8 @@ #include "GUI.hpp" #include "GUI_Utils.hpp" #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/CrealityDiscoveryDialog.cpp b/src/slic3r/GUI/CrealityDiscoveryDialog.cpp index 4f0c59038d..ec32292631 100644 --- a/src/slic3r/GUI/CrealityDiscoveryDialog.cpp +++ b/src/slic3r/GUI/CrealityDiscoveryDialog.cpp @@ -4,10 +4,19 @@ #include "I18N.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index 16b9a5765d..24591ae0f8 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -1,15 +1,69 @@ #include "CreatePresetsDialog.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/RadioBox.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include "libslic3r/libslic3r.h" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/ParamsDialog.hpp" #include #include #include #include #include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include #include "libslic3r/PresetBundle.hpp" #include "I18N.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/CreatePresetsDialog.hpp b/src/slic3r/GUI/CreatePresetsDialog.hpp index 07811aa144..39714af1fe 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.hpp +++ b/src/slic3r/GUI/CreatePresetsDialog.hpp @@ -13,6 +13,19 @@ #include "Widgets/DialogButtons.hpp" #include "miniz.h" #include "ParamsDialog.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DailyTips.cpp b/src/slic3r/GUI/DailyTips.cpp index 894c0316bb..8563766f81 100644 --- a/src/slic3r/GUI/DailyTips.cpp +++ b/src/slic3r/GUI/DailyTips.cpp @@ -1,5 +1,18 @@ #include "DailyTips.hpp" #include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/GLTexture.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/HintNotification.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/DailyTips.hpp b/src/slic3r/GUI/DailyTips.hpp index 537fed4952..96179ba791 100644 --- a/src/slic3r/GUI/DailyTips.hpp +++ b/src/slic3r/GUI/DailyTips.hpp @@ -4,6 +4,8 @@ #include "HintNotification.hpp" //#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp b/src/slic3r/GUI/DesktopIntegrationDialog.cpp index cbe9088f2e..aa5097a60e 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp @@ -1,3 +1,21 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include #ifdef __linux__ #include "DesktopIntegrationDialog.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.hpp b/src/slic3r/GUI/DesktopIntegrationDialog.hpp index c89315794a..e97c82f2ea 100644 --- a/src/slic3r/GUI/DesktopIntegrationDialog.hpp +++ b/src/slic3r/GUI/DesktopIntegrationDialog.hpp @@ -1,3 +1,4 @@ +#include #ifdef __linux__ #ifndef slic3r_DesktopIntegrationDialog_hpp_ #define slic3r_DesktopIntegrationDialog_hpp_ diff --git a/src/slic3r/GUI/DeviceCore/DevAxis.cpp b/src/slic3r/GUI/DeviceCore/DevAxis.cpp index 201e3afb00..1274054507 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxis.cpp +++ b/src/slic3r/GUI/DeviceCore/DevAxis.cpp @@ -1,7 +1,9 @@ #include "DevAxis.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevAxis.h b/src/slic3r/GUI/DeviceCore/DevAxis.h index a109ff8267..d543132e49 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxis.h +++ b/src/slic3r/GUI/DeviceCore/DevAxis.h @@ -1,5 +1,7 @@ #pragma once +#include #include +#include #include "slic3r/Utils/json_diff.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp index 6a975b3eb5..d1e210f940 100644 --- a/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevAxisCtrl.cpp @@ -1,7 +1,11 @@ #include "DevAxis.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/Utils/NetworkAgent.hpp" +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevBed.cpp b/src/slic3r/GUI/DeviceCore/DevBed.cpp index 09fd553159..134de17e30 100644 --- a/src/slic3r/GUI/DeviceCore/DevBed.cpp +++ b/src/slic3r/GUI/DeviceCore/DevBed.cpp @@ -1,4 +1,5 @@ #include "DevBed.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.cpp b/src/slic3r/GUI/DeviceCore/DevCalib.cpp index 6385fa77c6..74d73abbc0 100644 --- a/src/slic3r/GUI/DeviceCore/DevCalib.cpp +++ b/src/slic3r/GUI/DeviceCore/DevCalib.cpp @@ -1,4 +1,6 @@ +#include #include +#include "json_diff.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/DeviceManager.hpp" @@ -6,7 +8,13 @@ #include "slic3r/GUI/UserNotification.hpp" #include "libslic3r/PrintConfig.hpp" +#include +#include +#include "libslic3r/calib.hpp" +#include +#include #include +#include #include "fast_float/fast_float.h" #include "DevCalib.h" diff --git a/src/slic3r/GUI/DeviceCore/DevCalib.h b/src/slic3r/GUI/DeviceCore/DevCalib.h index d5894c1c9d..54f5f4b053 100644 --- a/src/slic3r/GUI/DeviceCore/DevCalib.h +++ b/src/slic3r/GUI/DeviceCore/DevCalib.h @@ -1,5 +1,7 @@ #pragma once #include +#include +#include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevChamber.cpp b/src/slic3r/GUI/DeviceCore/DevChamber.cpp index a0edef51c5..8cd47481f2 100644 --- a/src/slic3r/GUI/DeviceCore/DevChamber.cpp +++ b/src/slic3r/GUI/DeviceCore/DevChamber.cpp @@ -3,6 +3,7 @@ #include "DevConfig.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevChamber.h b/src/slic3r/GUI/DeviceCore/DevChamber.h index 29acacff9c..6fcafabcf2 100644 --- a/src/slic3r/GUI/DeviceCore/DevChamber.h +++ b/src/slic3r/GUI/DeviceCore/DevChamber.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp index 651806fd5f..01201998ce 100644 --- a/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevChamberCtrl.cpp @@ -1,5 +1,7 @@ #include "DevChamber.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevConfig.cpp b/src/slic3r/GUI/DeviceCore/DevConfig.cpp index 9833731040..cce5257527 100644 --- a/src/slic3r/GUI/DeviceCore/DevConfig.cpp +++ b/src/slic3r/GUI/DeviceCore/DevConfig.cpp @@ -2,6 +2,7 @@ #include "DevConfig.h" #include "DevUtil.h" +#include "json_diff.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp b/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp index 159fca6285..e6679f4463 100644 --- a/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp +++ b/src/slic3r/GUI/DeviceCore/DevConfigUtil.cpp @@ -1,9 +1,23 @@ #include "DevConfigUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include #include #include +#include #include "../I18N.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevConfigUtil.h b/src/slic3r/GUI/DeviceCore/DevConfigUtil.h index e42f2806d1..7eb0dff56b 100644 --- a/src/slic3r/GUI/DeviceCore/DevConfigUtil.h +++ b/src/slic3r/GUI/DeviceCore/DevConfigUtil.h @@ -8,8 +8,10 @@ #pragma once +#include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp index d1bcbfd864..e9301ad9a8 100644 --- a/src/slic3r/GUI/DeviceCore/DevCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevCtrl.cpp @@ -1,8 +1,11 @@ +#include #include +#include #include "DevCtrl.h" // TODO: remove this include #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevCtrl.h b/src/slic3r/GUI/DeviceCore/DevCtrl.h index 5cd564f27f..8dde98ec35 100644 --- a/src/slic3r/GUI/DeviceCore/DevCtrl.h +++ b/src/slic3r/GUI/DeviceCore/DevCtrl.h @@ -2,6 +2,8 @@ #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevDefs.h b/src/slic3r/GUI/DeviceCore/DevDefs.h index bde6a86622..6332d6b109 100644 --- a/src/slic3r/GUI/DeviceCore/DevDefs.h +++ b/src/slic3r/GUI/DeviceCore/DevDefs.h @@ -9,8 +9,12 @@ */ #pragma once +#include +#include #include #include +#include +#include // Reserved for future usage #define DEV_RESERVED_FOR_FUTURE(...) /* stripped */ diff --git a/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp b/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp index 5426a9bba3..1947cf1d87 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp +++ b/src/slic3r/GUI/DeviceCore/DevExtensionTool.cpp @@ -1,6 +1,8 @@ #include "DevExtensionTool.h" #include "DevUtil.h" +#include +#include #include using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevExtensionTool.h b/src/slic3r/GUI/DeviceCore/DevExtensionTool.h index c3b9c5b0b7..8ce33b6e43 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtensionTool.h +++ b/src/slic3r/GUI/DeviceCore/DevExtensionTool.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include "libslic3r/CommonDefs.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp index d4e1397c70..20975a7ca3 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.cpp @@ -1,9 +1,21 @@ +#include "libslic3r/CommonDefs.hpp" +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include #include "DevExtruderSystem.h" #include "DevNozzleSystem.h" #include "DevFilaSystem.h" // complete type for GetFilaSystem()->GetTrayIndexMap() in GetBackupAmsSlotInGroup // TODO: remove this include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h index 5770770175..4d9f7c9abf 100644 --- a/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevExtruderSystem.h @@ -1,9 +1,12 @@ #pragma once +#include #include +#include #include #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include #include #include "DevDefs.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFan.cpp b/src/slic3r/GUI/DeviceCore/DevFan.cpp index 3b5cb40702..30edbcdf35 100644 --- a/src/slic3r/GUI/DeviceCore/DevFan.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFan.cpp @@ -1,6 +1,12 @@ +#include +#include +#include #include #include "DevFan.h" +#include +#include #include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevFan.h b/src/slic3r/GUI/DeviceCore/DevFan.h index ca029e0005..393c8a477c 100644 --- a/src/slic3r/GUI/DeviceCore/DevFan.h +++ b/src/slic3r/GUI/DeviceCore/DevFan.h @@ -1,8 +1,12 @@ #pragma once +#include +#include #include #include "slic3r/Utils/json_diff.hpp" #include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h index ca59b9fd3e..f8d194c999 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSetting.h @@ -1,5 +1,7 @@ #pragma once +#include #include +#include #include // Orca: for m_firmwares / GetSuppotedFirmwares() — the unordered_map AMSSetting.cpp mirrors and iterates #include #include "DevCtrl.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp index 59f31db936..d9342a4c21 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaAmsSettingCtrl.cpp @@ -1,7 +1,9 @@ #include "DevFilaAmsSetting.h" #include "DevFilaSystem.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { int DevAmsSystemFirmwareSwitch::CrtlSwitchFirmware(int firmware_idx) diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp index 7ae990730a..c499b89622 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.cpp @@ -1,9 +1,20 @@ +#include +#include +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" #include #include +#include #include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include "DevFilaBlackList.h" +#include "json_diff.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "DevFilaSystem.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h index 80340d6efd..1f727396a8 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaBlackList.h @@ -1,6 +1,9 @@ #pragma once +#include #include +#include +#include #include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp index 11034ccfcd..cf872b7139 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSwitch.cpp @@ -4,6 +4,11 @@ #include "DevUtil.h" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp index 2cce41db9d..bef0391109 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.cpp @@ -1,5 +1,24 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include "DevFilaSystem.h" +#include "json_diff.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "DevNozzleSystem.h" // DevNozzle / DevNozzleSystem for GetNozzleFlowStringByAmsId diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h index 51fb744f72..32edc06a32 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystem.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp index 9a8a3a68d2..e2972a3254 100644 --- a/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevFilaSystemCtrl.cpp @@ -1,6 +1,8 @@ #include +#include #include "DevFilaSystem.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp"// TODO: remove this include #include "DevUtil.h" diff --git a/src/slic3r/GUI/DeviceCore/DevFirmware.h b/src/slic3r/GUI/DeviceCore/DevFirmware.h index 5b0ea986a2..1b251144e5 100644 --- a/src/slic3r/GUI/DeviceCore/DevFirmware.h +++ b/src/slic3r/GUI/DeviceCore/DevFirmware.h @@ -3,6 +3,7 @@ #include "slic3r/Utils/json_diff.hpp" #include +#include #include #include "slic3r/Utils/json_diff.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.cpp b/src/slic3r/GUI/DeviceCore/DevHMS.cpp index f6ba592c6d..456e806170 100644 --- a/src/slic3r/GUI/DeviceCore/DevHMS.cpp +++ b/src/slic3r/GUI/DeviceCore/DevHMS.cpp @@ -1,5 +1,10 @@ //#include "D:/dev/bamboo_slicer/build_release/src/slic3r/CMakeFiles/libslic3r_gui.dir/Release/cmake_pch.hxx" #include "DevHMS.h" +#include +#include +#include "json_diff.hpp" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevHMS.h b/src/slic3r/GUI/DeviceCore/DevHMS.h index f72d899187..6be4545e89 100644 --- a/src/slic3r/GUI/DeviceCore/DevHMS.h +++ b/src/slic3r/GUI/DeviceCore/DevHMS.h @@ -2,6 +2,8 @@ #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevLamp.cpp b/src/slic3r/GUI/DeviceCore/DevLamp.cpp index 19fd83e421..9b425fda21 100644 --- a/src/slic3r/GUI/DeviceCore/DevLamp.cpp +++ b/src/slic3r/GUI/DeviceCore/DevLamp.cpp @@ -1,4 +1,5 @@ #include "DevLamp.h" +#include static Slic3r::DevLamp::LIGHT_EFFECT _light_effect_parse(std::string effect_str) { diff --git a/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp index b35adc5cb3..5190632b5b 100644 --- a/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevLampCtrl.cpp @@ -1,7 +1,9 @@ #include +#include #include "DevLamp.h" // TODO: remove this include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" using namespace nlohmann; diff --git a/src/slic3r/GUI/DeviceCore/DevManager.cpp b/src/slic3r/GUI/DeviceCore/DevManager.cpp index 5a0e4d768f..0fd5ed2cc0 100644 --- a/src/slic3r/GUI/DeviceCore/DevManager.cpp +++ b/src/slic3r/GUI/DeviceCore/DevManager.cpp @@ -1,13 +1,29 @@ #include "DevManager.h" +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include +#include +#include #include #include #include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include +#include +#include +#include #include "CloudProvider.hpp" #include "DevUtil.h" // TODO: remove this include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/GUI_App.hpp" diff --git a/src/slic3r/GUI/DeviceCore/DevManager.h b/src/slic3r/GUI/DeviceCore/DevManager.h index 1ba4631881..5ab3eed01b 100644 --- a/src/slic3r/GUI/DeviceCore/DevManager.h +++ b/src/slic3r/GUI/DeviceCore/DevManager.h @@ -1,8 +1,12 @@ #pragma once +#include #include #include "libslic3r/CommonDefs.hpp" #include "slic3r/Utils/json_diff.hpp" +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.cpp b/src/slic3r/GUI/DeviceCore/DevMapping.cpp index 0040bb05f2..c98fc4bbfb 100644 --- a/src/slic3r/GUI/DeviceCore/DevMapping.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMapping.cpp @@ -1,6 +1,18 @@ +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include "DevMapping.h" #include "DevFilaSystem.h" #include "DevUtil.h" diff --git a/src/slic3r/GUI/DeviceCore/DevMapping.h b/src/slic3r/GUI/DeviceCore/DevMapping.h index e3169a03eb..52094f92b9 100644 --- a/src/slic3r/GUI/DeviceCore/DevMapping.h +++ b/src/slic3r/GUI/DeviceCore/DevMapping.h @@ -3,6 +3,7 @@ #include "libslic3r/ProjectTask.hpp" #include "slic3r/Utils/json_diff.hpp" +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp index 76bfa8364c..125e0acc68 100644 --- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp +++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.cpp @@ -7,6 +7,7 @@ #include "DevUtil.h" #include "DevUtilBackend.h" +#include "json_diff.hpp" #include "libslic3r/MultiNozzleUtils.hpp" #include "libslic3r/Print.hpp" @@ -16,8 +17,18 @@ #include "slic3r/GUI/GUI_App.hpp" +#include #include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" using namespace nlohmann; namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h index 7b0f9d0e25..b00e308789 100644 --- a/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h +++ b/src/slic3r/GUI/DeviceCore/DevMappingNozzle.h @@ -8,6 +8,7 @@ #include #include +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp index de372f1ea9..df82de7855 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.cpp @@ -2,6 +2,10 @@ #include "DevUtil.h" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include wxDEFINE_EVENT(DEV_RACK_EVENT_READING_FINISHED, wxCommandEvent); namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRack.h b/src/slic3r/GUI/DeviceCore/DevNozzleRack.h index 34b201c072..28c7990b78 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRack.h +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRack.h @@ -9,6 +9,7 @@ #include // wx +#include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp index cb0272dfe8..a2c56ce804 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleRackCtrl.cpp @@ -2,10 +2,14 @@ #include "DevUtil.h" #include "DevExtruderSystem.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/MsgDialog.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp index 9f1b5311c2..70eec0f795 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.cpp @@ -4,11 +4,29 @@ #include "DevNozzleSystem.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/I18N.hpp" #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include +#include +#include +#include +#include "libslic3r/MultiNozzleUtils.hpp" +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h index 168cb94116..f4fc97938b 100644 --- a/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h +++ b/src/slic3r/GUI/DeviceCore/DevNozzleSystem.h @@ -6,6 +6,10 @@ #include "libslic3r/MultiNozzleUtils.hpp" #include "slic3r/Utils/json_diff.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp b/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp index 1ba22b1091..082997e177 100644 --- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp +++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.cpp @@ -1,8 +1,14 @@ #include "DevPrintOptions.h" #include "DevUtil.h" +#include #include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h index 302d8270a2..587d5eef38 100644 --- a/src/slic3r/GUI/DeviceCore/DevPrintOptions.h +++ b/src/slic3r/GUI/DeviceCore/DevPrintOptions.h @@ -1,7 +1,9 @@ #pragma once +#include #include #include #include "slic3r/Utils/json_diff.hpp" +#include #include #include "DevDefs.h" diff --git a/src/slic3r/GUI/DeviceCore/DevStatus.cpp b/src/slic3r/GUI/DeviceCore/DevStatus.cpp index e37a0f9abc..cbf350339a 100644 --- a/src/slic3r/GUI/DeviceCore/DevStatus.cpp +++ b/src/slic3r/GUI/DeviceCore/DevStatus.cpp @@ -1,6 +1,7 @@ #include "DevStatus.h" #include "slic3r/GUI/DeviceManager.hpp" #include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.cpp b/src/slic3r/GUI/DeviceCore/DevStorage.cpp index 0c60b096bd..c70a717336 100644 --- a/src/slic3r/GUI/DeviceCore/DevStorage.cpp +++ b/src/slic3r/GUI/DeviceCore/DevStorage.cpp @@ -1,5 +1,7 @@ #include "DevStorage.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevStorage.h b/src/slic3r/GUI/DeviceCore/DevStorage.h index 8ac53b7fea..58f556499b 100644 --- a/src/slic3r/GUI/DeviceCore/DevStorage.h +++ b/src/slic3r/GUI/DeviceCore/DevStorage.h @@ -1,5 +1,6 @@ #pragma once #include +#include #include "slic3r/Utils/json_diff.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp b/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp index fc9ba0061d..c35ec8bfce 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUpgrade.cpp @@ -1,10 +1,17 @@ #include "DevUpgrade.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUpgrade.h b/src/slic3r/GUI/DeviceCore/DevUpgrade.h index a9d9b7c957..1593f54260 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgrade.h +++ b/src/slic3r/GUI/DeviceCore/DevUpgrade.h @@ -1,5 +1,9 @@ #pragma once +#include +#include #include +#include +#include #include "slic3r/Utils/json_diff.hpp" #include "DevDefs.h" diff --git a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp index 7fa2d2b5cf..6c46a0ef32 100644 --- a/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUpgradeCtrl.cpp @@ -1,7 +1,10 @@ #include "DevUpgrade.h" #include "DevUtil.h" +#include "json_diff.hpp" #include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUtil.cpp b/src/slic3r/GUI/DeviceCore/DevUtil.cpp index 19296d5773..b2ea072fc8 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtil.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUtil.cpp @@ -1,5 +1,15 @@ #include "DevUtil.h" #include "fast_float/fast_float.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/DeviceCore/DevUtil.h b/src/slic3r/GUI/DeviceCore/DevUtil.h index 6644b8b5b9..848b53957a 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtil.h +++ b/src/slic3r/GUI/DeviceCore/DevUtil.h @@ -7,6 +7,9 @@ */ #pragma once +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp index 5d051dc876..8c423977a3 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp +++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.cpp @@ -7,6 +7,19 @@ #include "slic3r/GUI/GUI_App.hpp" #include +#include "libslic3r/MultiNozzleUtils.hpp" +#include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFilaSystem.h" +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" #include namespace Slic3r diff --git a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h index ffcfc5fa2e..44540ae62c 100644 --- a/src/slic3r/GUI/DeviceCore/DevUtilBackend.h +++ b/src/slic3r/GUI/DeviceCore/DevUtilBackend.h @@ -12,6 +12,9 @@ #include "DevFilaSystem.h" #include "libslic3r/MultiNozzleUtils.hpp" +#include +#include +#include #include // Forward declarations diff --git a/src/slic3r/GUI/DeviceErrorDialog.cpp b/src/slic3r/GUI/DeviceErrorDialog.cpp index 4e81135a75..de578f78ed 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.cpp +++ b/src/slic3r/GUI/DeviceErrorDialog.cpp @@ -7,8 +7,28 @@ #include "ReleaseNote.hpp" #include "wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Monitor.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI diff --git a/src/slic3r/GUI/DeviceErrorDialog.hpp b/src/slic3r/GUI/DeviceErrorDialog.hpp index 1363f494a6..fd195242e7 100644 --- a/src/slic3r/GUI/DeviceErrorDialog.hpp +++ b/src/slic3r/GUI/DeviceErrorDialog.hpp @@ -1,10 +1,18 @@ #pragma once +#include +#include #include #include #include +#include +#include +#include +#include #include +#include #include +#include #include #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 29fd113d1f..9d60a0bf9a 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -1,3 +1,5 @@ +#include "PrinterNetworkTypes.hpp" +#include "json_diff.hpp" #include "libslic3r/libslic3r.h" #include "DeviceManager.hpp" #include "HMS.hpp" @@ -16,6 +18,46 @@ #include "Plater.hpp" #include "GUI_App.hpp" #include "ReleaseNote.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "libslic3r/Utils.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "slic3r/GUI/DeviceCore/DevCalib.h" +#include +#include +#include +#include "libslic3r/calib.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevFilaAmsSetting.h" +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/LifecycleEvents.hpp" +#include +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include "slic3r/GUI/UserNotification.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include #include #include #include @@ -25,7 +67,15 @@ #include #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "fast_float/fast_float.h" #include "DeviceCore/DevFilaSystem.h" diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp index 94f867b93d..c4a63cb588 100644 --- a/src/slic3r/GUI/DeviceManager.hpp +++ b/src/slic3r/GUI/DeviceManager.hpp @@ -1,9 +1,15 @@ #ifndef slic3r_DeviceManager_hpp_ #define slic3r_DeviceManager_hpp_ +#include +#include +#include #include #include #include +#include +#include +#include #include #include #include @@ -27,6 +33,7 @@ #include "DeviceErrorDialog.hpp" #include +#include #include #include diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp index 8505a559d6..f02007593a 100644 --- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp +++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.cpp @@ -13,8 +13,34 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp index 265666bb12..34cd85e692 100644 --- a/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp +++ b/src/slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp @@ -14,7 +14,19 @@ #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" #include +#include +#include "libslic3r/ProjectTask.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp index e33987af33..5014743f2d 100644 --- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp +++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp @@ -14,8 +14,14 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h index 867e6ac118..1ef6543018 100644 --- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h +++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h @@ -11,6 +11,8 @@ #include "slic3r/GUI/Widgets/PopupWindow.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include +#include //Previous defintions class wxGrid; diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp index 59fc8809ce..1e582acce9 100644 --- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp +++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp @@ -12,6 +12,12 @@ #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/Widgets/Label.hpp" // Orca: explicit Label include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include +#include #include #define MODEL_STR L("Model:") diff --git a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h index 342067e374..054164f313 100644 --- a/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h +++ b/src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h @@ -6,7 +6,11 @@ **********************************************************/ #pragma once +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" #include +#include #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/DeviceManager.hpp" diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp index 00d4c3e809..213a313d12 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.cpp @@ -22,7 +22,27 @@ #include "slic3r/GUI/Widgets/Button.hpp" #include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include +#include "slic3r/GUI/Monitor.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define WX_DIP_SIZE_18 wxSize(FromDIP(18), FromDIP(18)) #define WX_DIP_SIZE_46 wxSize(FromDIP(46), FromDIP(46)) diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp index eae377c147..6a27c16bb7 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.cpp @@ -18,6 +18,25 @@ #include "slic3r/GUI/Widgets/Button.hpp" #include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/CommonDefs.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/DeviceCore/DevFirmware.h" #define WX_DIP_SIZE(x, y) wxSize(FromDIP(x), FromDIP(y)) diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h index 06b950cd7e..f7210394a4 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h @@ -12,8 +12,14 @@ #include "slic3r/GUI/Widgets/StaticBox.hpp" #include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include +#include +#include +#include #include #include +#include // Previous definitions class Button; diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp index f351e7af2b..d7877656f7 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.cpp @@ -12,6 +12,16 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/DeviceTab/wgtMsgBox.h" #include "slic3r/GUI/Widgets/Label.hpp" // Orca: explicit Label include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" static wxColour s_gray_clr("#B0B0B0"); static wxColour s_hgreen_clr("#009688"); // Orca: accent green diff --git a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h index 729d24a03d..532b44b29d 100644 --- a/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h +++ b/src/slic3r/GUI/DeviceTab/wgtDeviceNozzleSelect.h @@ -9,6 +9,11 @@ #include "slic3r/GUI/DeviceCore/DevNozzleSystem.h" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include #include #include diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp index 22ee189777..504602bd79 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.cpp @@ -4,7 +4,11 @@ #include "slic3r/GUI/Widgets/Label.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include #include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgBox.h b/src/slic3r/GUI/DeviceTab/wgtMsgBox.h index 9f05abef96..c19956c711 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgBox.h +++ b/src/slic3r/GUI/DeviceTab/wgtMsgBox.h @@ -1,6 +1,7 @@ #ifndef WGTMSGBOX_H #define WGTMSGBOX_H +#include #include #include #include diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp index 16ae8812be..747fc96a02 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp +++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.cpp @@ -6,7 +6,14 @@ #include "slic3r/GUI/Widgets/StateColor.hpp" #include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include #include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h index 1f983ce2e4..f710bd51fa 100644 --- a/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h +++ b/src/slic3r/GUI/DeviceTab/wgtMsgPanel.h @@ -1,10 +1,12 @@ #pragma once +#include #include #include #include #include +#include class Label; diff --git a/src/slic3r/GUI/DockPanel.cpp b/src/slic3r/GUI/DockPanel.cpp index 0a5d25c4e7..ca5e064b7a 100644 --- a/src/slic3r/GUI/DockPanel.cpp +++ b/src/slic3r/GUI/DockPanel.cpp @@ -4,10 +4,13 @@ #include "Plater.hpp" #include "Widgets/WebHosting.hpp" +#include +#include "slic3r/GUI/WebPanel.hpp" #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DockPanel.hpp b/src/slic3r/GUI/DockPanel.hpp index a9a0a0d6b3..0eb1129787 100644 --- a/src/slic3r/GUI/DockPanel.hpp +++ b/src/slic3r/GUI/DockPanel.hpp @@ -3,6 +3,7 @@ #include "WebPanel.hpp" #include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DownloadProgressDialog.cpp b/src/slic3r/GUI/DownloadProgressDialog.cpp index 1c5ff4c3d7..cc04efdda5 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.cpp +++ b/src/slic3r/GUI/DownloadProgressDialog.cpp @@ -1,6 +1,17 @@ #include "DownloadProgressDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include #include +#include #include #include #include @@ -11,6 +22,8 @@ #include #include +#include +#include #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/DownloadProgressDialog.hpp b/src/slic3r/GUI/DownloadProgressDialog.hpp index fa23be5245..659fa20d6d 100644 --- a/src/slic3r/GUI/DownloadProgressDialog.hpp +++ b/src/slic3r/GUI/DownloadProgressDialog.hpp @@ -1,14 +1,17 @@ #ifndef slic3r_DownloadProgressDialog_hpp_ #define slic3r_DownloadProgressDialog_hpp_ +#include #include #include #include "GUI_Utils.hpp" #include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/Downloader.cpp b/src/slic3r/GUI/Downloader.cpp index 0d37a0eca6..e94b9f2b7d 100644 --- a/src/slic3r/GUI/Downloader.cpp +++ b/src/slic3r/GUI/Downloader.cpp @@ -5,8 +5,22 @@ #include "MainFrame.hpp" #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DownloaderFileGet.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Downloader.hpp b/src/slic3r/GUI/Downloader.hpp index 84a9a95697..308c9b2198 100644 --- a/src/slic3r/GUI/Downloader.hpp +++ b/src/slic3r/GUI/Downloader.hpp @@ -3,6 +3,11 @@ #include "DownloaderFileGet.hpp" #include +#include +#include +#include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/DownloaderFileGet.cpp b/src/slic3r/GUI/DownloaderFileGet.cpp index 4a7269affa..a35df951ff 100644 --- a/src/slic3r/GUI/DownloaderFileGet.cpp +++ b/src/slic3r/GUI/DownloaderFileGet.cpp @@ -1,5 +1,16 @@ #include "DownloaderFileGet.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -8,6 +19,8 @@ #include #include #include +#include +#include #include "format.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/DownloaderFileGet.hpp b/src/slic3r/GUI/DownloaderFileGet.hpp index 022d4c0c10..483ae8b1a5 100644 --- a/src/slic3r/GUI/DownloaderFileGet.hpp +++ b/src/slic3r/GUI/DownloaderFileGet.hpp @@ -3,6 +3,7 @@ #include "../Utils/Http.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/DragCanvas.cpp b/src/slic3r/GUI/DragCanvas.cpp index 66a9acecbc..353ab9416e 100644 --- a/src/slic3r/GUI/DragCanvas.cpp +++ b/src/slic3r/GUI/DragCanvas.cpp @@ -2,6 +2,16 @@ #include "wxExtensions.hpp" #include "GUI_App.hpp" #include "Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DragCanvas.hpp b/src/slic3r/GUI/DragCanvas.hpp index f39e836673..d61fa26eeb 100644 --- a/src/slic3r/GUI/DragCanvas.hpp +++ b/src/slic3r/GUI/DragCanvas.hpp @@ -4,6 +4,12 @@ #include "wx/bitmap.h" #include "wx/dragimag.h" #include "wx/panel.h" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DragDropPanel.cpp b/src/slic3r/GUI/DragDropPanel.cpp index 41c31d927b..f462e7a2ed 100644 --- a/src/slic3r/GUI/DragDropPanel.cpp +++ b/src/slic3r/GUI/DragDropPanel.cpp @@ -3,7 +3,29 @@ #include "I18N.hpp" #include "Widgets/Label.hpp" #include "Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/DragDropPanel.hpp b/src/slic3r/GUI/DragDropPanel.hpp index 4f2a4bced0..bfad906924 100644 --- a/src/slic3r/GUI/DragDropPanel.hpp +++ b/src/slic3r/GUI/DragDropPanel.hpp @@ -5,9 +5,14 @@ #include "GUI_Utils.hpp" #include "Widgets/Label.hpp" +#include +#include +#include +#include #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp index 3dff82d610..c9646295c0 100644 --- a/src/slic3r/GUI/EditGCodeDialog.cpp +++ b/src/slic3r/GUI/EditGCodeDialog.cpp @@ -1,12 +1,34 @@ #include "EditGCodeDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include #include +#include +#include #include #include "GUI.hpp" diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp index e6907acbf1..573d0fab8e 100644 --- a/src/slic3r/GUI/EditGCodeDialog.hpp +++ b/src/slic3r/GUI/EditGCodeDialog.hpp @@ -1,8 +1,13 @@ #ifndef slic3r_EditGCodeDialog_hpp_ #define slic3r_EditGCodeDialog_hpp_ +#include +#include +#include +#include #include +#include #include #include @@ -11,6 +16,7 @@ #include "libslic3r/Preset.hpp" #include "libslic3r/PrintConfig.hpp" #include +#include class wxListBox; class wxTextCtrl; diff --git a/src/slic3r/GUI/EncodedFilament.cpp b/src/slic3r/GUI/EncodedFilament.cpp index 0cab200386..737c66ff33 100644 --- a/src/slic3r/GUI/EncodedFilament.cpp +++ b/src/slic3r/GUI/EncodedFilament.cpp @@ -1,5 +1,14 @@ #include "EncodedFilament.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include #include +#include +#include +#include +#include +#include #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/EncodedFilament.hpp b/src/slic3r/GUI/EncodedFilament.hpp index 9150998b65..8e3542b1e4 100644 --- a/src/slic3r/GUI/EncodedFilament.hpp +++ b/src/slic3r/GUI/EncodedFilament.hpp @@ -1,6 +1,9 @@ #ifndef slic3r_ENCODED_FILAMENT_hpp_ #define slic3r_ENCODED_FILAMENT_hpp_ +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Event.hpp b/src/slic3r/GUI/Event.hpp index 9fbf2d8fcc..d693b93f67 100644 --- a/src/slic3r/GUI/Event.hpp +++ b/src/slic3r/GUI/Event.hpp @@ -2,8 +2,10 @@ #define slic3r_Events_hpp_ #include +#include #include #include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.cpp b/src/slic3r/GUI/ExportPresetBundleDialog.cpp index 9d2f26bf6a..f4e27c4367 100644 --- a/src/slic3r/GUI/ExportPresetBundleDialog.cpp +++ b/src/slic3r/GUI/ExportPresetBundleDialog.cpp @@ -4,10 +4,30 @@ #include "ConfigWizard.hpp" #include "I18N.hpp" #include "GUI_App.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/GUI.hpp" #include #include +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/ExportPresetBundleDialog.hpp b/src/slic3r/GUI/ExportPresetBundleDialog.hpp index 9340759c06..2038cd7677 100644 --- a/src/slic3r/GUI/ExportPresetBundleDialog.hpp +++ b/src/slic3r/GUI/ExportPresetBundleDialog.hpp @@ -6,12 +6,20 @@ #include "Widgets/WebViewHostDialog.hpp" #include "libslic3r/AppConfig.hpp" +#include "libslic3r/Preset.hpp" #include +#include +#include +#include +#include +#include #include #include +#include #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp index 3abfdb82ff..56311406cc 100644 --- a/src/slic3r/GUI/ExtraRenderers.cpp +++ b/src/slic3r/GUI/ExtraRenderers.cpp @@ -6,7 +6,20 @@ #include "Plater.hpp" #include "Widgets/ComboBox.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #ifdef wxHAS_GENERIC_DATAVIEWCTRL #include "wx/generic/private/markuptext.h" #include "wx/generic/private/rowheightcache.h" diff --git a/src/slic3r/GUI/ExtraRenderers.hpp b/src/slic3r/GUI/ExtraRenderers.hpp index 59a1f040ee..4defa2e389 100644 --- a/src/slic3r/GUI/ExtraRenderers.hpp +++ b/src/slic3r/GUI/ExtraRenderers.hpp @@ -3,7 +3,16 @@ #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #if wxUSE_MARKUP #define SUPPORTS_MARKUP diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index 1f07823d61..e15470e462 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -6,7 +6,30 @@ #include #include "I18N.hpp" #include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "CalibUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ExtrusionCalibration.hpp b/src/slic3r/GUI/ExtrusionCalibration.hpp index c7b6c28c8d..cbee1b56b1 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.hpp +++ b/src/slic3r/GUI/ExtrusionCalibration.hpp @@ -16,6 +16,13 @@ #include "ParamsDialog.hpp" #include "GUI_App.hpp" #include "wx/hyperlink.h" +#include +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include #define EXTRUSION_CALIBRATION_DEF_COLOUR wxColour(255, 255, 255) #define EXTRUSION_CALIBRATION_GREY900 wxColour(38, 46, 48) diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 74ef3f87c8..8ca4722e3d 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -11,16 +11,60 @@ #include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include +#include #include +#include "libslic3r/LocalesUtils.hpp" +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/enum_bitmask.hpp" +#include +#include "libslic3r/libslic3r.h" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include "libslic3r/Color.hpp" #include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/DropDown.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include #include "OG_CustomCtrl.hpp" #include "MsgDialog.hpp" #include "BitmapComboBox.hpp" diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp index 3f55bf5c5a..da078d37a4 100644 --- a/src/slic3r/GUI/Field.hpp +++ b/src/slic3r/GUI/Field.hpp @@ -1,6 +1,16 @@ #ifndef SLIC3R_GUI_FIELD_HPP #define SLIC3R_GUI_FIELD_HPP +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/FilamentBitmapUtils.cpp b/src/slic3r/GUI/FilamentBitmapUtils.cpp index 3af3d1ad01..c3381bd3a7 100644 --- a/src/slic3r/GUI/FilamentBitmapUtils.cpp +++ b/src/slic3r/GUI/FilamentBitmapUtils.cpp @@ -1,7 +1,20 @@ +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include +#include +#include #include #include +#include +#include +#include #include +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/FilamentBitmapUtils.hpp b/src/slic3r/GUI/FilamentBitmapUtils.hpp index 687d34a825..b95a61a1b6 100644 --- a/src/slic3r/GUI/FilamentBitmapUtils.hpp +++ b/src/slic3r/GUI/FilamentBitmapUtils.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_FilamentBitmapUtils_hpp_ #define slic3r_GUI_FilamentBitmapUtils_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/FilamentGroupPopup.cpp b/src/slic3r/GUI/FilamentGroupPopup.cpp index e5e49928dc..d8442071b4 100644 --- a/src/slic3r/GUI/FilamentGroupPopup.cpp +++ b/src/slic3r/GUI/FilamentGroupPopup.cpp @@ -5,6 +5,29 @@ #include "I18N.hpp" #include "PartPlate.hpp" #include "Widgets/HyperLink.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentGroupPopup.hpp b/src/slic3r/GUI/FilamentGroupPopup.hpp index 6d0bd43da7..09b6b8d344 100644 --- a/src/slic3r/GUI/FilamentGroupPopup.hpp +++ b/src/slic3r/GUI/FilamentGroupPopup.hpp @@ -1,8 +1,10 @@ #ifndef FILAMENT_GROUP_HOVER_HPP #define FILAMENT_GROUP_HOVER_HPP +#include #include #include +#include #include #include #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/FilamentMapDialog.cpp b/src/slic3r/GUI/FilamentMapDialog.cpp index 7bb6f51421..e23d0c5d0f 100644 --- a/src/slic3r/GUI/FilamentMapDialog.cpp +++ b/src/slic3r/GUI/FilamentMapDialog.cpp @@ -7,6 +7,19 @@ #include "GUI_App.hpp" #include "CapsuleButton.hpp" #include "MsgDialog.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/FilamentMapPanel.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentMapDialog.hpp b/src/slic3r/GUI/FilamentMapDialog.hpp index fd1b056347..df588bd4ca 100644 --- a/src/slic3r/GUI/FilamentMapDialog.hpp +++ b/src/slic3r/GUI/FilamentMapDialog.hpp @@ -2,7 +2,11 @@ #define slic3r_FilamentMapDialog_hpp_ #include "FilamentMapPanel.hpp" +#include +#include "libslic3r/PrintConfig.hpp" #include +#include +#include #include "CapsuleButton.hpp" #include "Widgets/CheckBox.hpp" diff --git a/src/slic3r/GUI/FilamentMapPanel.cpp b/src/slic3r/GUI/FilamentMapPanel.cpp index bd7d42333b..599a41dff8 100644 --- a/src/slic3r/GUI/FilamentMapPanel.cpp +++ b/src/slic3r/GUI/FilamentMapPanel.cpp @@ -4,8 +4,27 @@ #include "Plater.hpp" #include "Widgets/MultiNozzleSync.hpp" // manuallySetNozzleCount producer for extruder_nozzle_stats #include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DragDropPanel.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" #include +#include +#include +#include +#include +#include +#include #include +#include #include "wx/graphics.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentMapPanel.hpp b/src/slic3r/GUI/FilamentMapPanel.hpp index ce7c8010a3..c165c76be6 100644 --- a/src/slic3r/GUI/FilamentMapPanel.hpp +++ b/src/slic3r/GUI/FilamentMapPanel.hpp @@ -6,6 +6,13 @@ #include "DragDropPanel.hpp" #include "wxExtensions.hpp" #include "Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FilamentPickerDialog.cpp b/src/slic3r/GUI/FilamentPickerDialog.cpp index 5b5af59501..8821a43c52 100644 --- a/src/slic3r/GUI/FilamentPickerDialog.cpp +++ b/src/slic3r/GUI/FilamentPickerDialog.cpp @@ -9,6 +9,28 @@ #include "Widgets/StateColor.hpp" #include "Widgets/DialogButtons.hpp" #include "wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/FilamentBitmapUtils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/FilamentPickerDialog.hpp b/src/slic3r/GUI/FilamentPickerDialog.hpp index 2a1412c947..06b73bab56 100644 --- a/src/slic3r/GUI/FilamentPickerDialog.hpp +++ b/src/slic3r/GUI/FilamentPickerDialog.hpp @@ -7,7 +7,11 @@ #include "FilamentBitmapUtils.hpp" #include "Widgets/Button.hpp" #include "EncodedFilament.hpp" +#include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/FileArchiveDialog.cpp b/src/slic3r/GUI/FileArchiveDialog.cpp index 982187211c..42fdc9a700 100644 --- a/src/slic3r/GUI/FileArchiveDialog.cpp +++ b/src/slic3r/GUI/FileArchiveDialog.cpp @@ -6,9 +6,31 @@ #include "MainFrame.hpp" #include "ExtraRenderers.hpp" #include "format.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/miniz_extension.hpp" +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/FileArchiveDialog.hpp b/src/slic3r/GUI/FileArchiveDialog.hpp index decb960589..0afac1fd33 100644 --- a/src/slic3r/GUI/FileArchiveDialog.hpp +++ b/src/slic3r/GUI/FileArchiveDialog.hpp @@ -5,6 +5,16 @@ #include "libslic3r/miniz_extension.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index cb3fc8d292..04c930dcfe 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -28,6 +28,52 @@ #include "libslic3r/Layer.hpp" #include "Widgets/ProgressDialog.hpp" #include "MsgDialog.hpp" +#include +#include "libvgcode/include/Types.hpp" +#include +#include +#include +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libvgcode/include/Viewer.hpp" +#include "libvgcode/include/PathVertex.hpp" +#include +#include +#include "slic3r/GUI/LibVGCode/LibVGCodeWrapper.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/IMSlider.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libvgcode/include/GCodeInputData.hpp" +#include "libvgcode/include/ColorRange.hpp" +#include +#include "libslic3r_version.h" +#include +#include "libslic3r/Slicing.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/PrintBase.hpp" +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/CustomGCode.hpp" +#include "libslic3r/ExtrusionEntity.hpp" #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index f4ebe2e81d..5154726aba 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -8,17 +8,30 @@ #include "GLModel.hpp" #include "I18N.hpp" +#include #include #include "LibVGCode/LibVGCodeWrapper.hpp" // needed for tech VGCODE_ENABLE_COG_AND_TOOL_MARKERS +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libvgcode/include/GCodeInputData.hpp" +#include +#include "libvgcode/include/PathVertex.hpp" #include #include #include #include #include +#include #include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 01ff6de714..ea116587ac 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1,4 +1,68 @@ #include "libslic3r/libslic3r.h" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Slicing.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include +#include +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/IMSlider.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/Camera.hpp" +#include "slic3r/GUI/GCodeViewer.hpp" +#include +#include +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "libslic3r/PrintBase.hpp" +#include +#include "libslic3r/SLA/SupportPoint.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/GCode/WipeTowerEstimate.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/GLTexture.hpp" +#include +#include +#include "slic3r/GUI/GLToolbar.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Line.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "libslic3r/LifecycleEvents.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include "libslic3r/GCode/WipeTower.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include "slic3r/GUI/Jobs/Job.hpp" +#include +#include "libslic3r/Color.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Selection.hpp" #include "GLCanvas3D.hpp" #ifdef SLIC3R_CAD #include "slic3r/GUI/CAD/DesignSketchTool.hpp" // Design tab: interactive 2D sketch tool diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 36a6c7b944..f861e15ca1 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -1,6 +1,24 @@ #ifndef slic3r_GLCanvas3D_hpp_ #define slic3r_GLCanvas3D_hpp_ +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include "libslic3r/Geometry.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Model.hpp" +#include "libvgcode/include/Types.hpp" +#include "libvgcode/include/PathVertex.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/Line.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include #include #include @@ -25,6 +43,14 @@ #include +#include +#include +#include +#include +#include +#include +#include +#include #include class wxSizeEvent; diff --git a/src/slic3r/GUI/GLModel.cpp b/src/slic3r/GUI/GLModel.cpp index 92296030e1..52526e0e10 100644 --- a/src/slic3r/GUI/GLModel.cpp +++ b/src/slic3r/GUI/GLModel.cpp @@ -11,8 +11,29 @@ #include "libslic3r/BuildVolume.hpp" #include "libslic3r/Geometry/ConvexHull.hpp" +#include +#include +#include #include #include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/Geometry/Circle.hpp" +#include +#include +#include +#include "libslic3r/Geometry.hpp" #if defined(L) #undef L diff --git a/src/slic3r/GUI/GLModel.hpp b/src/slic3r/GUI/GLModel.hpp index d007b31371..343d64df83 100644 --- a/src/slic3r/GUI/GLModel.hpp +++ b/src/slic3r/GUI/GLModel.hpp @@ -4,6 +4,8 @@ #include "libslic3r/Point.hpp" #include "libslic3r/BoundingBox.hpp" #include "libslic3r/Color.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/GLSelectionRectangle.cpp b/src/slic3r/GUI/GLSelectionRectangle.cpp index 966749ac85..0f7ac82862 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.cpp +++ b/src/slic3r/GUI/GLSelectionRectangle.cpp @@ -5,9 +5,17 @@ #include "GLCanvas3D.hpp" #include "GUI_App.hpp" #include "Plater.hpp" +#include #include #include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include "libslic3r/Color.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLSelectionRectangle.hpp b/src/slic3r/GUI/GLSelectionRectangle.hpp index f588b4fddd..5578f70e59 100644 --- a/src/slic3r/GUI/GLSelectionRectangle.hpp +++ b/src/slic3r/GUI/GLSelectionRectangle.hpp @@ -3,6 +3,9 @@ #include "libslic3r/Point.hpp" #include "GLModel.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/GLShader.cpp b/src/slic3r/GUI/GLShader.cpp index 96a8c7c095..7d091e74f3 100644 --- a/src/slic3r/GUI/GLShader.cpp +++ b/src/slic3r/GUI/GLShader.cpp @@ -6,11 +6,21 @@ #include "libslic3r/format.hpp" #include "libslic3r/Color.hpp" +#include +#include #include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include "libslic3r/Point.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/GLShader.hpp b/src/slic3r/GUI/GLShader.hpp index 935daaaeaa..52bec0389f 100644 --- a/src/slic3r/GUI/GLShader.hpp +++ b/src/slic3r/GUI/GLShader.hpp @@ -2,8 +2,12 @@ #define slic3r_GLShader_hpp_ #include +#include +#include #include #include +#include +#include #include "libslic3r/Point.hpp" diff --git a/src/slic3r/GUI/GLShadersManager.cpp b/src/slic3r/GUI/GLShadersManager.cpp index be0c57c658..003f994a21 100644 --- a/src/slic3r/GUI/GLShadersManager.cpp +++ b/src/slic3r/GUI/GLShadersManager.cpp @@ -6,7 +6,13 @@ #include #include +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "libslic3r/Technologies.hpp" #include +#include using namespace std::literals; #include diff --git a/src/slic3r/GUI/GLShadersManager.hpp b/src/slic3r/GUI/GLShadersManager.hpp index b2bbc140bd..bcf10aea5e 100644 --- a/src/slic3r/GUI/GLShadersManager.hpp +++ b/src/slic3r/GUI/GLShadersManager.hpp @@ -3,6 +3,7 @@ #include "GLShader.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp index 1e8f253ea9..4cdb17dd28 100644 --- a/src/slic3r/GUI/GLTexture.cpp +++ b/src/slic3r/GUI/GLTexture.cpp @@ -12,8 +12,22 @@ #include "GUI.hpp" #include "GLModel.hpp" +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Point.hpp" #include #include #include @@ -21,6 +35,9 @@ #include #include #include +#include +#include +#include #include "FileHelp.hpp" #define STB_DXT_IMPLEMENTATION #include "stb_dxt/stb_dxt.h" diff --git a/src/slic3r/GUI/GLTexture.hpp b/src/slic3r/GUI/GLTexture.hpp index cf6f0f1d71..9ec20dcde6 100644 --- a/src/slic3r/GUI/GLTexture.hpp +++ b/src/slic3r/GUI/GLTexture.hpp @@ -3,12 +3,14 @@ #include #include +#include #include #include #include #include #include +#include class wxImage; diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index e36385c946..91afb33370 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -8,8 +8,15 @@ #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/Plater.hpp" +#include #include +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/GLToolbar.hpp b/src/slic3r/GUI/GLToolbar.hpp index 638ac937d4..192af7e50d 100644 --- a/src/slic3r/GUI/GLToolbar.hpp +++ b/src/slic3r/GUI/GLToolbar.hpp @@ -1,9 +1,11 @@ #ifndef slic3r_GLToolbar_hpp_ #define slic3r_GLToolbar_hpp_ +#include #include #include #include +#include #include "GLTexture.hpp" #include "Event.hpp" diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index d7bd96f178..ac66e1b988 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -5,6 +5,26 @@ #include "I18N.hpp" #include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include #ifdef __APPLE__ #include "slic3r/Utils/MacDarkMode.hpp" #endif diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp index a5bbb35f6f..afaae47f40 100644 --- a/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_hpp_ #define slic3r_GUI_hpp_ +#include namespace boost { class any; } namespace boost::filesystem { class path; } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 6c824c1392..7eaa0aad85 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -1,4 +1,7 @@ +#include "CloudProvider.hpp" #include "ExportPresetBundleDialog.hpp" +#include "ICloudServiceAgent.hpp" +#include "IPrinterAgent.hpp" #include "OrcaCloudServiceAgent.hpp" #include "libslic3r/Technologies.hpp" #include "libslic3r/Platform.hpp" @@ -21,12 +24,96 @@ #include "libslic3r_version.h" #include "BuildCommit.hpp" #include "Downloader.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "libslic3r/Exception.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include +#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "slic3r/GUI/UserNotification.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/PrinterWebView.hpp" +#include "libslic3r/PrintConfig.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // Localization headers: include libslic3r version first so everything in this file // uses the slic3r/GUI version (the macros will take precedence over the functions). diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index da37c79242..91efa51377 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -1,9 +1,22 @@ #ifndef slic3r_GUI_App_hpp_ #define slic3r_GUI_App_hpp_ +#include +#include +#include +#include #include +#include +#include #include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Semver.hpp" #include +#include +#include "slic3r/GUI/GLShader.hpp" #include #include "ActionRegistry.hpp" #include "ImGuiWrapper.hpp" @@ -11,15 +24,23 @@ #include "OpenGLManager.hpp" #include "libslic3r/Preset.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r_version.h" #include "slic3r/GUI/UserNotification.hpp" #include "slic3r/Utils/CloudProvider.hpp" #include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" #include "slic3r/GUI/HttpServer.hpp" #include "../Utils/PrintHost.hpp" +#include +#include #include #include +#include #include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/GUI_AuxiliaryList.cpp b/src/slic3r/GUI/GUI_AuxiliaryList.cpp index be9f99a76a..bfc3ecf044 100644 --- a/src/slic3r/GUI/GUI_AuxiliaryList.cpp +++ b/src/slic3r/GUI/GUI_AuxiliaryList.cpp @@ -1,9 +1,24 @@ +#include "slic3r/GUI/AuxiliaryDataViewModel.hpp" +#include +#include "libslic3r/Utils.hpp" +#include #include #include "GUI_AuxiliaryList.hpp" #include "I18N.hpp" #include "wxExtensions.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "GUI_App.hpp" #include "Plater.hpp" diff --git a/src/slic3r/GUI/GUI_Factories.cpp b/src/slic3r/GUI/GUI_Factories.cpp index 8bc899bb3d..7913a33e7c 100644 --- a/src/slic3r/GUI/GUI_Factories.cpp +++ b/src/slic3r/GUI/GUI_Factories.cpp @@ -20,7 +20,32 @@ #include "Gizmos/GLGizmoEmboss.hpp" #include "Gizmos/GLGizmoSVG.hpp" +#include +#include #include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include #include "slic3r/GUI/Tab.hpp" #include "ParamsPanel.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/GUI_Factories.hpp b/src/slic3r/GUI/GUI_Factories.hpp index ad694f15de..4202cce5bc 100644 --- a/src/slic3r/GUI/GUI_Factories.hpp +++ b/src/slic3r/GUI/GUI_Factories.hpp @@ -2,6 +2,7 @@ #define slic3r_GUI_Factories_hpp_ #include +#include #include #include #include diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp index 93fbd5204c..0eb2110b19 100644 --- a/src/slic3r/GUI/GUI_Init.cpp +++ b/src/slic3r/GUI/GUI_Init.cpp @@ -11,10 +11,19 @@ #include "slic3r/GUI/Plater.hpp" // To show a message box if GUI initialization ends up with an exception thrown. +#include +#include +#include +#include "libslic3r/Exception.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include #include #include #include +#include #if __APPLE__ #include diff --git a/src/slic3r/GUI/GUI_Init.hpp b/src/slic3r/GUI/GUI_Init.hpp index 0d987fa014..44d8964977 100644 --- a/src/slic3r/GUI/GUI_Init.hpp +++ b/src/slic3r/GUI/GUI_Init.hpp @@ -3,6 +3,9 @@ #include #include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/GUI_ObjectLayers.cpp b/src/slic3r/GUI/GUI_ObjectLayers.cpp index 93bdeec9ee..1bf8d9106f 100644 --- a/src/slic3r/GUI/GUI_ObjectLayers.cpp +++ b/src/slic3r/GUI/GUI_ObjectLayers.cpp @@ -14,6 +14,23 @@ #include "I18N.hpp" +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/LocalesUtils.hpp" +#include "slic3r/GUI/GUI.hpp" #include namespace Slic3r diff --git a/src/slic3r/GUI/GUI_ObjectLayers.hpp b/src/slic3r/GUI/GUI_ObjectLayers.hpp index ab547d80dc..d161ef1e2b 100644 --- a/src/slic3r/GUI/GUI_ObjectLayers.hpp +++ b/src/slic3r/GUI/GUI_ObjectLayers.hpp @@ -3,6 +3,11 @@ #include "GUI_ObjectSettings.hpp" #include "wxExtensions.hpp" +#include +#include +#include +#include +#include #ifdef __WXOSX__ #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 99c023e4a1..e2226b3d3e 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -28,16 +28,67 @@ #include "StepMeshDialog.hpp" +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/ExtraRenderers.hpp" +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include "slic3r/GUI/GLToolbar.hpp" +#include +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Format/STEP.hpp" +#include +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include +#include +#include "libslic3r/BrimEarsPoint.hpp" +#include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include #include #include +#include #include "slic3r/Utils/FixModelByCgal.hpp" #include "libslic3r/Format/bbs_3mf.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 2700dbc5d8..4aff69534e 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -1,13 +1,23 @@ #ifndef slic3r_GUI_ObjectList_hpp_ #define slic3r_GUI_ObjectList_hpp_ +#include +#include +#include #include +#include +#include #include #include +#include #include #include +#include +#include #include +#include +#include #include "Event.hpp" #include "wxExtensions.hpp" diff --git a/src/slic3r/GUI/GUI_ObjectSettings.cpp b/src/slic3r/GUI/GUI_ObjectSettings.cpp index 25e6204a40..efe7f71899 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.cpp @@ -16,6 +16,15 @@ #include "I18N.hpp" #include "ConfigManipulation.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include "libslic3r/Config.hpp" +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/GUI_ObjectSettings.hpp b/src/slic3r/GUI/GUI_ObjectSettings.hpp index 21146425cc..485f014684 100644 --- a/src/slic3r/GUI/GUI_ObjectSettings.hpp +++ b/src/slic3r/GUI/GUI_ObjectSettings.hpp @@ -2,8 +2,10 @@ #define slic3r_GUI_ObjectSettings_hpp_ #include +#include #include #include +#include #include "wxExtensions.hpp" #define NEW_OBJECT_SETTING 1 diff --git a/src/slic3r/GUI/GUI_ObjectTable.cpp b/src/slic3r/GUI/GUI_ObjectTable.cpp index a7c761a06f..822b42c696 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.cpp +++ b/src/slic3r/GUI/GUI_ObjectTable.cpp @@ -17,6 +17,39 @@ #include "BitmapCache.hpp" #include "GUI_ObjectTable.hpp" #include "GUI_ObjectList.hpp" +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include //use wxGridWindow to compute position //#include "wx/generic/private/grid.h" diff --git a/src/slic3r/GUI/GUI_ObjectTable.hpp b/src/slic3r/GUI/GUI_ObjectTable.hpp index 0fbd432e02..724f7d9885 100644 --- a/src/slic3r/GUI/GUI_ObjectTable.hpp +++ b/src/slic3r/GUI/GUI_ObjectTable.hpp @@ -1,6 +1,20 @@ #ifndef slic3r_GUI_ObjectTable_hpp_ #define slic3r_GUI_ObjectTable_hpp_ +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" #include #include #include diff --git a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp index 4cd272840f..fbca655a24 100644 --- a/src/slic3r/GUI/GUI_ObjectTableSettings.cpp +++ b/src/slic3r/GUI/GUI_ObjectTableSettings.cpp @@ -15,6 +15,19 @@ #include "I18N.hpp" #include "ConfigManipulation.hpp" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include #include namespace Slic3r diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index 2c44202876..7ea2bba557 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -5,6 +5,23 @@ #include "GUI_Preview.hpp" #include "GUI_App.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/CustomGCode.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/ExPolygon.hpp" +#include +#include "libvgcode/include/Types.hpp" #if ENABLE_OPENGL_AUTO_AA_SAMPLES #include "GUI_Init.hpp" #endif // ENABLE_OPENGL_AUTO_AA_SAMPLES diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index fdfe364fb8..3080b7a89a 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_Preview_hpp_ #define slic3r_GUI_Preview_hpp_ +#include +#include "libslic3r/libslic3r.h" +#include +#include #include #include "libslic3r/Point.hpp" @@ -12,6 +16,7 @@ #include #include "libslic3r/GCode/GCodeProcessor.hpp" #include +#include class wxGLCanvas; class wxBoxSizer; diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp index 5c55e341c9..f8ec0d3c90 100644 --- a/src/slic3r/GUI/GUI_Utils.cpp +++ b/src/slic3r/GUI/GUI_Utils.cpp @@ -4,8 +4,29 @@ #include "I18N.hpp" #include +#include #include #include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 #include diff --git a/src/slic3r/GUI/GUI_Utils.hpp b/src/slic3r/GUI/GUI_Utils.hpp index dae0305f1d..f77e6b6bc0 100644 --- a/src/slic3r/GUI/GUI_Utils.hpp +++ b/src/slic3r/GUI/GUI_Utils.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_Utils_hpp_ #define slic3r_GUI_Utils_hpp_ +#include +#include +#include +#include #include #include #include @@ -9,11 +13,14 @@ #include #include +#include +#include #include #include #include #include #include +#include #include #include #include @@ -23,6 +30,9 @@ #include #include +#include +#include +#include #include "Event.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp index 9560078cb2..ae45707682 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp @@ -10,14 +10,23 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/MeasureUtils.hpp" +#include +#include +#include #include +#include "libslic3r/Measure.hpp" #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include #include #include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp index 4804af9c4a..f35ad90aa2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp @@ -2,6 +2,8 @@ #define slic3r_GLGizmoAssembly_hpp_ #include "GLGizmoMeasure.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp index 6ff2c8213d..90b175ddfd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.cpp @@ -1,7 +1,29 @@ #include "GLGizmoBase.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include +#include #include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Utils.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp index 47e8f832a6..c19b5e4c05 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBase.hpp @@ -10,9 +10,16 @@ #include "slic3r/GUI/SceneRaycaster.hpp" #include "slic3r/GUI/3DScene.hpp" +#include +#include #include +#include +#include +#include #include +#include +#include #include #define ENABLE_FIXED_GRABBER 1 diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp index 750e5fe6cb..7f52b2cc0c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp @@ -1,5 +1,40 @@ #include "GLGizmoBrimEars.hpp" +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/CutUtils.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include "libslic3r/Utils.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/BrimEarsPoint.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Polygon.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/MultiPoint.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" +#include "libslic3r/Model.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/Camera.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp index 075fb37b21..35177bfac6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp @@ -6,6 +6,22 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/BrimEarsPoint.hpp" #include "libslic3r/ObjectID.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Polygon.hpp" +#include +#include "libslic3r/Geometry.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp index 2100b1fca7..ebd0821ded 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp @@ -1,9 +1,54 @@ #include "GLGizmoCut.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" +#include +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Line.hpp" +#include +#include "libslic3r/TriangleMesh.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/CutUtils.hpp" +#include "libslic3r/AABBMesh.hpp" +#include +#include +#include +#include +#include "libslic3r/ObjectID.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "libslic3r/enum_bitmask.hpp" +#include "slic3r/GUI/Widgets/ProgressDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp index 109e0fe5bc..d2c872d9f3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp @@ -9,6 +9,19 @@ #include "libslic3r/Model.hpp" #include "libslic3r/CutUtils.hpp" #include "imgui/imgui.h" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include +#include +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Color.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index da26353eb6..5bf94c7d77 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -1,4 +1,5 @@ #include "GLGizmoEmboss.hpp" +#include "EmbossStyleManager.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Shortcuts.hpp" @@ -29,6 +30,51 @@ #include "libslic3r/BuildVolume.hpp" #include "imgui/imgui_stdlib.h" // using std::string for inputs +#include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/TextLines.hpp" +#include +#include +#include "libslic3r/Emboss.hpp" +#include "libslic3r/TextConfiguration.hpp" +#include "libslic3r/EmbossShape.hpp" +#include "slic3r/GUI/IconManager.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/SurfaceDrag.hpp" +#include +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Polygon.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp index 4ad41483ac..0823e613a3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp @@ -10,6 +10,8 @@ #include "slic3r/Utils/RaycastManager.hpp" #include "slic3r/Utils/EmbossStyleManager.hpp" +#include +#include "libslic3r/ObjectID.hpp" #include #include #include @@ -20,6 +22,11 @@ #include #include +#include +#include +#include +#include +#include class wxFont; namespace Slic3r{ diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp index 06d69c3e82..6a6288a71c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp @@ -17,9 +17,34 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include +#include +#include +#include #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/ExtrusionEntity.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp index d282a06b65..9c5b18e927 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp @@ -9,6 +9,14 @@ #include "slic3r/GUI/I18N.hpp" #include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp index 54dbd96ba7..5d9c4b15b7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp @@ -8,9 +8,25 @@ #include "libslic3r/LayOnFace.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include "slic3r/GUI/MeshUtils.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp index 74e2062de4..4f5a29e458 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFlatten.hpp @@ -4,6 +4,12 @@ #include "GLGizmoBase.hpp" #include "slic3r/GUI/GLModel.hpp" #include "slic3r/GUI/MeshUtils.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp index 8938e8a264..7f36e85e80 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.cpp @@ -14,8 +14,24 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include #include #include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp index ed6a38e068..88f07d3092 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoFuzzySkin.hpp @@ -4,6 +4,13 @@ #include "GLGizmoPainterBase.hpp" #include "slic3r/GUI/I18N.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "libslic3r/TriangleSelector.hpp" +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp index 8ec564e5b4..087e6e7af1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp @@ -11,15 +11,52 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/MeasureUtils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/Point.hpp" +#include "libslic3r/Measure.hpp" +#include +#include "libslic3r/TriangleMesh.hpp" +#include +#include "libslic3r/Model.hpp" +#include +#include "libslic3r/Geometry.hpp" +#include +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" #include #include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" #include +#include +#include +#include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp index 40cb3bab1f..1d76810050 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeasure.hpp @@ -8,6 +8,19 @@ #include "slic3r/GUI/I18N.hpp" #include "libslic3r/Measure.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp index b91f0a9468..f8ffe44b85 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.cpp @@ -8,6 +8,25 @@ #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/Camera.hpp" #include "slic3r/GUI/NotificationManager.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/TriangleSelector.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp index 3ba613295d..458728cd05 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp @@ -4,6 +4,12 @@ #include "GLGizmoBase.hpp" #include "GLGizmosCommon.hpp" #include "libslic3r/Model.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 2e741fa5e5..2a19cf3ee7 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -17,7 +17,28 @@ #include "GLGizmoUtils.hpp" +#include +#include +#include +#include #include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GLShader.hpp" namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp index b2b04acdbe..165fc40fd9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp @@ -3,6 +3,18 @@ #include "GLGizmoPainterBase.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "libslic3r/TriangleSelector.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp index 4bee1a6cfc..bed2c42267 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.cpp @@ -7,8 +7,24 @@ #include "libslic3r/AppConfig.hpp" +#include +#include +#include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include "libslic3r/Model.hpp" #include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp index fecc8abf1c..8296ba7c5e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMove.hpp @@ -4,6 +4,11 @@ #include "GLGizmoBase.hpp" //BBS: add size adjust related #include "GizmoObjectManipulation.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp index d90579e589..c9847afcde 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.cpp @@ -2,6 +2,14 @@ #include "slic3r/GUI/GLCanvas3D.hpp" #include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include "slic3r/GUI/GUI_App.hpp" @@ -13,8 +21,27 @@ #include "libslic3r/PresetBundle.hpp" #include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/Utils.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include +#include "libslic3r/Config.hpp" #include #include +#include "slic3r/GUI/GLModel.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp index 19856603fa..a98f303fe1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp @@ -9,10 +9,20 @@ #include "libslic3r/TriangleSelector.hpp" #include "libslic3r/Model.hpp" +#include +#include #include +#include #include +#include "libslic3r/Point.hpp" +#include "libslic3r/Color.hpp" #include +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp index 4e1a197a39..e03b561c38 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.cpp @@ -6,6 +6,16 @@ #include "slic3r/GUI/GUI_ObjectList.hpp" #include "slic3r/GUI/NotificationManager.hpp" #include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "libslic3r/CAD/GeometryEngine.hpp" +#include +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp index f78289a58d..8ac7754007 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp @@ -4,6 +4,10 @@ #include "GLGizmoBase.hpp" #include "GLGizmosCommon.hpp" #include "libslic3r/CAD/GeometryEngine.hpp" +#include +#include +#include +#include "libslic3r/TriangleMesh.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp index 835b97f072..8d1b3e50df 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp @@ -10,7 +10,28 @@ #include "libslic3r/PresetBundle.hpp" +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include +#include +#include "libslic3r/Line.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp index 8cbacde3c6..44222479bd 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp @@ -4,6 +4,14 @@ #include "GLGizmoBase.hpp" //BBS: add size adjust related #include "GizmoObjectManipulation.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include "libslic3r/Color.hpp" +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/3DScene.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp index 94373391fa..8660e3c508 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp @@ -23,6 +23,44 @@ #include "libslic3r/ClipperUtils.hpp" // union_ex #include "imgui/imgui_stdlib.h" // using std::string for inputs +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/EmbossShape.hpp" +#include +#include +#include +#include "slic3r/GUI/IconManager.hpp" +#include +#include "slic3r/GUI/SurfaceDrag.hpp" +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include "libslic3r/Line.hpp" +#include +#include +#include +#include "libslic3r/ExPolygon.hpp" +#include +#include "slic3r/GUI/Selection.hpp" +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp index 4a0bf84934..2d59135769 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp @@ -10,6 +10,8 @@ #include "slic3r/Utils/RaycastManager.hpp" #include "slic3r/GUI/IconManager.hpp" +#include "libslic3r/EmbossShape.hpp" +#include "libslic3r/ObjectID.hpp" #include #include #include @@ -20,6 +22,10 @@ #include #include +#include +#include +#include +#include namespace Slic3r{ class ModelVolume; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp index c30acba386..a223749b6c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.cpp @@ -4,8 +4,26 @@ #include "slic3r/GUI/Shortcuts.hpp" #include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include #include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include "libslic3r/Model.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include +#include "libslic3r/Geometry.hpp" #include namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp index 3bfb63ff7a..d830b9f36a 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoScale.hpp @@ -6,6 +6,15 @@ #include "GizmoObjectManipulation.hpp" #include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "libslic3r/libslic3r.h" namespace Slic3r { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp index f36a47c8ec..3ae5604226 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp @@ -13,7 +13,21 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp index f1c48a12d6..ac4382c5ca 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp @@ -2,6 +2,12 @@ #define slic3r_GLGizmoSeam_hpp_ #include "GLGizmoPainterBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp index 6a08d5eff4..59af0eab06 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp @@ -11,9 +11,32 @@ #include "libslic3r/Model.hpp" #include "libslic3r/QuadricEdgeCollapse.hpp" +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Gizmos/GLGizmosManager.hpp" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" #include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp index b4be94d2c9..fa43291705 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp @@ -6,8 +6,19 @@ #include "GLGizmoBase.hpp" #include "slic3r/GUI/3DScene.hpp" #include "admesh/stl.h" // indexed_triangle_set +#include +#include +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/GLModel.hpp" +#include +#include #include +#include namespace Slic3r { class ModelVolume; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp index 195ceba713..60e8e383c6 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.cpp @@ -9,6 +9,24 @@ #include #include #include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include "libslic3r/CAD/SketchEngine.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/CAD/GeometryEngine.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp index 5a4b59edfd..9e878db152 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSketch.hpp @@ -4,7 +4,13 @@ #include "GLGizmoBase.hpp" #include "GLGizmosCommon.hpp" #include "libslic3r/CAD/SketchEngine.hpp" +#include +#include #include +#include +#include +#include +#include "libslic3r/Point.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp index 33b2ef1ef6..3577ba8b3b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp @@ -1,8 +1,11 @@ #include "GLGizmoTextureDisplacement.hpp" +#include #include +#include #include +#include "ColorSpaceConvert.hpp" #include "libslic3r/AABBTreeIndirect.hpp" #include "libslic3r/Color.hpp" #include "libslic3r/PresetBundle.hpp" @@ -34,7 +37,32 @@ #include "slic3r/Utils/UndoRedo.hpp" #include "GLGizmoUtils.hpp" +#include +#include +#include +#include +#include #include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include +#include "slic3r/GUI/GLTexture.hpp" +#include "libslic3r/TextureDisplacement.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/Event.hpp" +#include "slic3r/GUI/IconManager.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/TextureBake/TextureBakeDebug.hpp" +#include #include #include #include @@ -42,6 +70,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp index 705408b153..6685f8d713 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp @@ -10,11 +10,23 @@ #include "slic3r/GUI/IconManager.hpp" #include "slic3r/GUI/TextureLibrary.hpp" +#include #include #include +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/TriangleSelector.hpp" +#include +#include "libslic3r/Point.hpp" +#include #include #include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" #include +#include +#include +#include +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp index 75dca0855d..d5aab16808 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.cpp @@ -3,6 +3,12 @@ #include "GLGizmosManager.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp b/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp index 1eed68b2cd..f6feee3df1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoUtils.hpp @@ -2,6 +2,7 @@ #define GL_GIZMO_UTIL_HPP #include +#include #include #include #include diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp index 5243c8294f..18308b81b2 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.cpp @@ -1,5 +1,6 @@ #include "GLGizmosCommon.hpp" +#include #include #include "slic3r/GUI/GLCanvas3D.hpp" @@ -10,7 +11,18 @@ #include "libslic3r/PresetBundle.hpp" +#include #include +#include "slic3r/GUI/Selection.hpp" +#include +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp index 2ab910785b..d2eeda4f64 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosCommon.hpp @@ -1,8 +1,15 @@ #ifndef slic3r_GUI_GLGizmosCommon_hpp_ #define slic3r_GUI_GLGizmosCommon_hpp_ +#include "libslic3r/TriangleMesh.hpp" +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" #include #include +#include +#include #include "slic3r/GUI/3DScene.hpp" #include "slic3r/GUI/MeshUtils.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 40c272fcb7..f9d88b67b8 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -29,6 +29,27 @@ #include "slic3r/GUI/Gizmos/GLGizmoSVG.hpp" #include "slic3r/GUI/Gizmos/GLGizmoMeshBoolean.hpp" #include "slic3r/GUI/Gizmos/GLGizmoAssembly.hpp" +#include +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoMeasure.hpp" +#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp" +#include +#include +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" #ifdef SLIC3R_CAD #include "slic3r/GUI/Gizmos/GLGizmoPrimitive.hpp" #include "slic3r/GUI/Gizmos/GLGizmoSketch.hpp" diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp index 2903b38777..63207f741b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp @@ -10,6 +10,16 @@ #include "libslic3r/ObjectID.hpp" +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp index 5d70fde833..3d9d18883d 100644 --- a/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp +++ b/src/slic3r/GUI/Gizmos/GizmoObjectManipulation.cpp @@ -1,4 +1,10 @@ #include "slic3r/GUI/ImGuiWrapper.hpp" +#include +#include +#include +#include +#include +#include #include #include "GizmoObjectManipulation.hpp" @@ -18,6 +24,17 @@ #include "GLGizmoUtils.hpp" #include +#include "libslic3r/Point.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include +#include +#include "libslic3r/Color.hpp" #define MAX_NUM 9999.99 #define MAX_SIZE std::string_view{"9999.99"} diff --git a/src/slic3r/GUI/GradientCurveEditor.cpp b/src/slic3r/GUI/GradientCurveEditor.cpp index 6d38ef81a5..b18bfe0480 100644 --- a/src/slic3r/GUI/GradientCurveEditor.cpp +++ b/src/slic3r/GUI/GradientCurveEditor.cpp @@ -7,11 +7,20 @@ #include #include +#include "libslic3r/FilamentMixer.hpp" +#include #include +#include +#include +#include #include #include #include +#include +#include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/GuiColor.cpp b/src/slic3r/GUI/GuiColor.cpp index b5225d41d3..d1055ce19d 100644 --- a/src/slic3r/GUI/GuiColor.cpp +++ b/src/slic3r/GUI/GuiColor.cpp @@ -1,4 +1,8 @@ #include "GuiColor.hpp" +#include +#include "libslic3r/Color.hpp" +#include +#include "ColorSpaceConvert.hpp" namespace Slic3r { namespace GUI { wxColour convert_to_wxColour(const RGBA &color) diff --git a/src/slic3r/GUI/HMS.cpp b/src/slic3r/GUI/HMS.cpp index f00e661df2..5a37823092 100644 --- a/src/slic3r/GUI/HMS.cpp +++ b/src/slic3r/GUI/HMS.cpp @@ -5,9 +5,25 @@ #include "DeviceManager.hpp" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevUtil.h" +#include "Http.hpp" +#include "json_diff.hpp" #include "libslic3r/AppConfig.hpp" +#include +#include +#include #include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include static const char* HMS_PATH = "hms"; static const char* HMS_LOCAL_IMG_PATH = "hms/local_image"; diff --git a/src/slic3r/GUI/HMS.hpp b/src/slic3r/GUI/HMS.hpp index c494539b36..fdbf6f5fc4 100644 --- a/src/slic3r/GUI/HMS.hpp +++ b/src/slic3r/GUI/HMS.hpp @@ -15,6 +15,8 @@ #include #include #include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/HMSPanel.cpp b/src/slic3r/GUI/HMSPanel.cpp index 1268cb8f7b..c767c8613c 100644 --- a/src/slic3r/GUI/HMSPanel.cpp +++ b/src/slic3r/GUI/HMSPanel.cpp @@ -1,8 +1,20 @@ #include "HMS.hpp" #include "HMSPanel.hpp" +#include "slic3r/GUI/DeviceCore/DevHMS.h" +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include #include "GUI.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" diff --git a/src/slic3r/GUI/HMSPanel.hpp b/src/slic3r/GUI/HMSPanel.hpp index 25ac56de96..c87ffccec7 100644 --- a/src/slic3r/GUI/HMSPanel.hpp +++ b/src/slic3r/GUI/HMSPanel.hpp @@ -1,7 +1,13 @@ #ifndef slic3r_HMSPanel_hpp_ #define slic3r_HMSPanel_hpp_ +#include +#include +#include +#include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp index de5f12e07e..2267918b5a 100644 --- a/src/slic3r/GUI/HintNotification.cpp +++ b/src/slic3r/GUI/HintNotification.cpp @@ -15,6 +15,22 @@ #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Exception.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -26,6 +42,12 @@ #include #include #include +#include +#include +#include "slic3r/GUI/GUI_App.hpp" +#include +#include "slic3r/GUI/NotificationManager.hpp" +#include "slic3r/GUI/GUI.hpp" #define HINTS_CEREAL_VERSION 1 // structure for writing used hints into binary file with version diff --git a/src/slic3r/GUI/HintNotification.hpp b/src/slic3r/GUI/HintNotification.hpp index 89a2871c5a..cb05697869 100644 --- a/src/slic3r/GUI/HintNotification.hpp +++ b/src/slic3r/GUI/HintNotification.hpp @@ -2,6 +2,12 @@ #define slic3r_GUI_HintNotification_hpp_ #include "NotificationManager.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r {namespace GUI { diff --git a/src/slic3r/GUI/HttpServer.cpp b/src/slic3r/GUI/HttpServer.cpp index ef26f20173..789d833006 100644 --- a/src/slic3r/GUI/HttpServer.cpp +++ b/src/slic3r/GUI/HttpServer.cpp @@ -1,11 +1,30 @@ #include "HttpServer.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "CloudProvider.hpp" #include "GUI_App.hpp" #include "slic3r/Utils/Http.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/Utils/BBLNetworkPlugin.hpp" #include "libslic3r/Thread.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include using json = nlohmann::json; diff --git a/src/slic3r/GUI/HttpServer.hpp b/src/slic3r/GUI/HttpServer.hpp index 4c0b929663..d609821bc6 100644 --- a/src/slic3r/GUI/HttpServer.hpp +++ b/src/slic3r/GUI/HttpServer.hpp @@ -1,8 +1,15 @@ #ifndef slic3r_Http_App_hpp_ #define slic3r_Http_App_hpp_ +#include +#include +#include +#include +#include #include +#include #include +#include #include #include diff --git a/src/slic3r/GUI/I18N.cpp b/src/slic3r/GUI/I18N.cpp index 530a321431..f1f9764839 100644 --- a/src/slic3r/GUI/I18N.cpp +++ b/src/slic3r/GUI/I18N.cpp @@ -1,4 +1,8 @@ #include "I18N.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/I18N.hpp b/src/slic3r/GUI/I18N.hpp index 2c338a1fd9..f2ca833423 100644 --- a/src/slic3r/GUI/I18N.hpp +++ b/src/slic3r/GUI/I18N.hpp @@ -1,3 +1,7 @@ +#include +#include +#include +#include #ifndef _ #define _(s) Slic3r::GUI::I18N::translate((s)) #define _L(s) Slic3r::GUI::I18N::translate((s)) diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index fa777b6a37..239882457f 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -4,6 +4,34 @@ #include "GUI.hpp" #include "NotificationManager.hpp" #include "Widgets/StateColor.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/CustomGCode.hpp" +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include "slic3r/GUI/TickCode.hpp" +#include +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS #endif diff --git a/src/slic3r/GUI/IMSlider.hpp b/src/slic3r/GUI/IMSlider.hpp index d28a65c1ff..41e3d6747f 100644 --- a/src/slic3r/GUI/IMSlider.hpp +++ b/src/slic3r/GUI/IMSlider.hpp @@ -2,7 +2,14 @@ #define slic3r_GUI_IMSlider_hpp_ #include "TickCode.hpp" +#include +#include +#include #include +#include +#include "libslic3r/CustomGCode.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/IMToolbar.cpp b/src/slic3r/GUI/IMToolbar.cpp index 2a569c960b..1629644df9 100644 --- a/src/slic3r/GUI/IMToolbar.cpp +++ b/src/slic3r/GUI/IMToolbar.cpp @@ -1,9 +1,12 @@ #include "IMToolbar.hpp" #include "3DScene.hpp" +#include #include #include #include +#include +#include "libslic3r/Utils.hpp" #include "nanosvg/nanosvg.h" #include "nanosvg/nanosvgrast.h" diff --git a/src/slic3r/GUI/IMediaController.hpp b/src/slic3r/GUI/IMediaController.hpp index 3b4cbf7d24..72798ff983 100644 --- a/src/slic3r/GUI/IMediaController.hpp +++ b/src/slic3r/GUI/IMediaController.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp index abe76f052f..ebdf9b93a4 100644 --- a/src/slic3r/GUI/IconManager.cpp +++ b/src/slic3r/GUI/IconManager.cpp @@ -1,5 +1,15 @@ #include "IconManager.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -10,6 +20,9 @@ #include "3DScene.hpp" // glsafe #include +#include +#include +#include #define STB_RECT_PACK_IMPLEMENTATION #include "imgui/imstb_rectpack.h" // distribute rectangles diff --git a/src/slic3r/GUI/IconManager.hpp b/src/slic3r/GUI/IconManager.hpp index 24ec3f7a91..b5d86fbd6e 100644 --- a/src/slic3r/GUI/IconManager.hpp +++ b/src/slic3r/GUI/IconManager.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_IconManager_hpp_ #define slic3r_IconManager_hpp_ +#include #include #include #include "imgui/imgui.h" // ImVec2 diff --git a/src/slic3r/GUI/IdleScheduler.cpp b/src/slic3r/GUI/IdleScheduler.cpp index 18498fce0d..bfece0e3fe 100644 --- a/src/slic3r/GUI/IdleScheduler.cpp +++ b/src/slic3r/GUI/IdleScheduler.cpp @@ -3,7 +3,11 @@ #include #include +#include +#include +#include #include +#include #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/IdleScheduler.hpp b/src/slic3r/GUI/IdleScheduler.hpp index 7c31e9414c..a210971e74 100644 --- a/src/slic3r/GUI/IdleScheduler.hpp +++ b/src/slic3r/GUI/IdleScheduler.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include "slic3r/GUI/Lazy.hpp" #include #include diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index fe5ddc9fa0..64bb5e11ca 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -1,6 +1,28 @@ #include "ImGuiWrapper.hpp" +#include +#include +#include +#include #include +#include "libslic3r/Technologies.hpp" +#include +#include +#include +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include +#include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Exception.hpp" +#include #include #include #include @@ -8,6 +30,9 @@ #include #include #include +#include +#include +#include #if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT #include #include diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index ad83d50d2d..1a6f5e1bb9 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -1,8 +1,12 @@ #ifndef slic3r_ImGuiWrapper_hpp_ #define slic3r_ImGuiWrapper_hpp_ +#include "libslic3r/Technologies.hpp" +#include #include #include +#include +#include #include #include diff --git a/src/slic3r/GUI/ImageDPIFrame.cpp b/src/slic3r/GUI/ImageDPIFrame.cpp index 8dad9c44da..655fa87633 100644 --- a/src/slic3r/GUI/ImageDPIFrame.cpp +++ b/src/slic3r/GUI/ImageDPIFrame.cpp @@ -1,6 +1,11 @@ #include "ImageDPIFrame.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" #include +#include #include #include #include @@ -10,6 +15,11 @@ #include "I18N.hpp" #include "MainFrame.hpp" #include +#include +#include +#include +#include +#include #include "wxExtensions.hpp" using namespace Slic3r; diff --git a/src/slic3r/GUI/ImageDPIFrame.hpp b/src/slic3r/GUI/ImageDPIFrame.hpp index c22d296492..494f158b9a 100644 --- a/src/slic3r/GUI/ImageDPIFrame.hpp +++ b/src/slic3r/GUI/ImageDPIFrame.hpp @@ -3,7 +3,9 @@ #include "GUI_App.hpp" #include "GUI_Utils.hpp" +#include #include +#include #include class wxStaticBitmap; diff --git a/src/slic3r/GUI/ImageGrid.cpp b/src/slic3r/GUI/ImageGrid.cpp index f6bf25d77c..280b95055d 100644 --- a/src/slic3r/GUI/ImageGrid.cpp +++ b/src/slic3r/GUI/ImageGrid.cpp @@ -6,9 +6,27 @@ #include "GUI_App.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include wxDEFINE_EVENT(EVT_ITEM_ACTION, wxCommandEvent); diff --git a/src/slic3r/GUI/ImageGrid.h b/src/slic3r/GUI/ImageGrid.h index 4bc17e4b6d..b2025c91ed 100644 --- a/src/slic3r/GUI/ImageGrid.h +++ b/src/slic3r/GUI/ImageGrid.h @@ -8,6 +8,14 @@ #ifndef ImageGrid_h #define ImageGrid_h +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/InstanceCheck.cpp b/src/slic3r/GUI/InstanceCheck.cpp index 28c5176cb1..8205b5edc3 100644 --- a/src/slic3r/GUI/InstanceCheck.cpp +++ b/src/slic3r/GUI/InstanceCheck.cpp @@ -1,7 +1,23 @@ #include "GUI_App.hpp" #include "InstanceCheck.hpp" #include "Plater.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 #include "MainFrame.hpp" diff --git a/src/slic3r/GUI/InstanceCheck.hpp b/src/slic3r/GUI/InstanceCheck.hpp index 9bfb3e2500..47b26cd868 100644 --- a/src/slic3r/GUI/InstanceCheck.hpp +++ b/src/slic3r/GUI/InstanceCheck.hpp @@ -2,6 +2,10 @@ #define slic3r_InstanceCheck_hpp_ #include "Event.hpp" +#include +#include +#include +#include #if _WIN32 #include diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.cpp b/src/slic3r/GUI/Jobs/ArrangeJob.cpp index 438bda2cc2..c89c574e55 100644 --- a/src/slic3r/GUI/Jobs/ArrangeJob.cpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.cpp @@ -16,6 +16,27 @@ #include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" +#include "libslic3r/Arrange.hpp" +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/Polygon.hpp" +#include +#include +#include +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include #define SAVE_ARRANGE_POLY 0 diff --git a/src/slic3r/GUI/Jobs/ArrangeJob.hpp b/src/slic3r/GUI/Jobs/ArrangeJob.hpp index 0c9f03de01..c161a55f2d 100644 --- a/src/slic3r/GUI/Jobs/ArrangeJob.hpp +++ b/src/slic3r/GUI/Jobs/ArrangeJob.hpp @@ -2,7 +2,11 @@ #define ARRANGEJOB_HPP +#include +#include "libslic3r/Polygon.hpp" +#include #include +#include #include "Job.hpp" #include "libslic3r/Arrange.hpp" diff --git a/src/slic3r/GUI/Jobs/BindJob.cpp b/src/slic3r/GUI/Jobs/BindJob.cpp index 76af712f63..502511ca7e 100644 --- a/src/slic3r/GUI/Jobs/BindJob.cpp +++ b/src/slic3r/GUI/Jobs/BindJob.cpp @@ -1,5 +1,6 @@ #include "BindJob.hpp" +#include "bambu_networking.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -9,6 +10,13 @@ #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/GUI/DeviceCore/DevManager.h" +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/BindJob.hpp b/src/slic3r/GUI/Jobs/BindJob.hpp index 1e8aa91d6f..7670b58611 100644 --- a/src/slic3r/GUI/Jobs/BindJob.hpp +++ b/src/slic3r/GUI/Jobs/BindJob.hpp @@ -3,6 +3,10 @@ #include #include +#include +#include +#include +#include #include "Job.hpp" namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp index 1c44a71eb7..9f1f52c763 100644 --- a/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp +++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.cpp @@ -1,4 +1,14 @@ +#include +#include +#include #include +#include "slic3r/GUI/Jobs/ThreadSafeQueue.hpp" +#include +#include +#include +#include +#include "libslic3r/Thread.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" #include "BoostThreadWorker.hpp" diff --git a/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp b/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp index 3887be79c1..dc95047e41 100644 --- a/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp +++ b/src/slic3r/GUI/Jobs/BoostThreadWorker.hpp @@ -1,12 +1,22 @@ #ifndef BOOSTTHREADWORKER_HPP #define BOOSTTHREADWORKER_HPP +#include #include #include "Worker.hpp" +#include +#include +#include +#include #include #include +#include "slic3r/GUI/Jobs/Job.hpp" +#include +#include +#include +#include "slic3r/GUI/Jobs/ProgressIndicator.hpp" #include "ThreadSafeQueue.hpp" #include "slic3r/GUI/GUI.hpp" diff --git a/src/slic3r/GUI/Jobs/BusyCursorJob.hpp b/src/slic3r/GUI/Jobs/BusyCursorJob.hpp index 8504d1eb93..12b9b15bcf 100644 --- a/src/slic3r/GUI/Jobs/BusyCursorJob.hpp +++ b/src/slic3r/GUI/Jobs/BusyCursorJob.hpp @@ -3,6 +3,8 @@ #include "Job.hpp" +#include +#include #include #include diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp index c452018a7f..6159182c2b 100644 --- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp +++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp @@ -15,6 +15,20 @@ #include "wx/fontenum.h" #include +#include +#include +#include +#include +#include +#include +#include "libslic3r/TextConfiguration.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include +#include "libslic3r/SLA/RasterBase.hpp" +#include "libslic3r/libslic3r.h" +#include using namespace Slic3r; using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp index e103e11682..572ac21d4e 100644 --- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp +++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_CreateFontNameImageJob_hpp_ #define slic3r_CreateFontNameImageJob_hpp_ +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp index 31bd6728b1..ac9b11b81e 100644 --- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp +++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp @@ -1,6 +1,7 @@ #include "CreateFontStyleImagesJob.hpp" // rasterization of ExPoly +#include "EmbossStyleManager.hpp" #include "libslic3r/SLA/AGGRaster.hpp" #include "slic3r/GUI/3DScene.hpp" // ::glsafe @@ -8,6 +9,19 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Plater.hpp" #include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include +#include +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/Emboss.hpp" +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/SLA/RasterBase.hpp" +#include "libslic3r/libslic3r.h" +#include +#include +#include using namespace Slic3r; using namespace Slic3r::Emboss; diff --git a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp index b8c2757a62..f2f37c0418 100644 --- a/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp +++ b/src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_CreateFontStyleImagesJob_hpp_ #define slic3r_CreateFontStyleImagesJob_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp index 58cdbd95f4..e92ab2b1ed 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.cpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp @@ -1,6 +1,32 @@ #include "EmbossJob.hpp" +#include +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Emboss.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/Geometry.hpp" +#include +#include "slic3r/GUI/SurfaceDrag.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/EmbossShape.hpp" +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include #include +#include #include #include @@ -9,6 +35,9 @@ #include // use surface cuts #include // create object #include +#include +#include +#include #include "libslic3r/libslic3r.h" #include "slic3r/GUI/Plater.hpp" diff --git a/src/slic3r/GUI/Jobs/EmbossJob.hpp b/src/slic3r/GUI/Jobs/EmbossJob.hpp index a9160619ca..9bf2fb0fc1 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.hpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.hpp @@ -2,10 +2,15 @@ #define slic3r_EmbossJob_hpp_ #include +#include #include +#include +#include "slic3r/GUI/3DScene.hpp" #include #include #include // ExPolygonsWithIds +#include +#include #include "libslic3r/Point.hpp" // Transform3d #include "libslic3r/ObjectID.hpp" diff --git a/src/slic3r/GUI/Jobs/FillBedJob.cpp b/src/slic3r/GUI/Jobs/FillBedJob.cpp index 961b8af566..f01dc846ca 100644 --- a/src/slic3r/GUI/Jobs/FillBedJob.cpp +++ b/src/slic3r/GUI/Jobs/FillBedJob.cpp @@ -9,7 +9,25 @@ #include "slic3r/plugin/PluginManager.hpp" #include "libnest2d/common.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/LifecycleEvents.hpp" #include +#include "slic3r/GUI/Jobs/ArrangeJob.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/Jobs/Job.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/FillBedJob.hpp b/src/slic3r/GUI/Jobs/FillBedJob.hpp index 28950aeac8..6a2300dc60 100644 --- a/src/slic3r/GUI/Jobs/FillBedJob.hpp +++ b/src/slic3r/GUI/Jobs/FillBedJob.hpp @@ -2,6 +2,10 @@ #define FILLBEDJOB_HPP #include "ArrangeJob.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/Point.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/Job.hpp b/src/slic3r/GUI/Jobs/Job.hpp index 4058acf03f..80254c43c3 100644 --- a/src/slic3r/GUI/Jobs/Job.hpp +++ b/src/slic3r/GUI/Jobs/Job.hpp @@ -3,8 +3,10 @@ #include #include +#include #include +#include #include #include "libslic3r/libslic3r.h" diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp index bbe5898736..91d1c007c3 100644 --- a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp +++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.cpp @@ -1,5 +1,7 @@ #include "NotificationProgressIndicator.hpp" #include "slic3r/GUI/NotificationManager.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp index cc09876e31..89eff74ea2 100644 --- a/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp +++ b/src/slic3r/GUI/Jobs/NotificationProgressIndicator.hpp @@ -2,6 +2,7 @@ #define NOTIFICATIONPROGRESSINDICATOR_HPP #include "ProgressIndicator.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OAuthJob.cpp b/src/slic3r/GUI/Jobs/OAuthJob.cpp index 8a8d02ac90..e24146f3d0 100644 --- a/src/slic3r/GUI/Jobs/OAuthJob.cpp +++ b/src/slic3r/GUI/Jobs/OAuthJob.cpp @@ -5,7 +5,15 @@ #include "slic3r/GUI/I18N.hpp" #include "nlohmann/json.hpp" #include +#include +#include +#include +#include +#include "slic3r/GUI/HttpServer.hpp" +#include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OAuthJob.hpp b/src/slic3r/GUI/Jobs/OAuthJob.hpp index 7b58c53b2e..0377cada59 100644 --- a/src/slic3r/GUI/Jobs/OAuthJob.hpp +++ b/src/slic3r/GUI/Jobs/OAuthJob.hpp @@ -3,9 +3,14 @@ #include "Job.hpp" #include "slic3r/GUI/HttpServer.hpp" +#include #include #include #include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OrientJob.cpp b/src/slic3r/GUI/Jobs/OrientJob.cpp index ed9117e8bf..e9f5048c43 100644 --- a/src/slic3r/GUI/Jobs/OrientJob.cpp +++ b/src/slic3r/GUI/Jobs/OrientJob.cpp @@ -7,6 +7,24 @@ #include "slic3r/GUI/NotificationManager.hpp" #include "slic3r/plugin/PluginManager.hpp" #include "libslic3r/PresetBundle.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Job.hpp" +#include "libslic3r/Orient.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/OrientJob.hpp b/src/slic3r/GUI/Jobs/OrientJob.hpp index 968be209ed..bf4eddc6e2 100644 --- a/src/slic3r/GUI/Jobs/OrientJob.hpp +++ b/src/slic3r/GUI/Jobs/OrientJob.hpp @@ -3,6 +3,9 @@ #include "Job.hpp" #include "libslic3r/Orient.hpp" +#include +#include +#include "libslic3r/Model.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/Jobs/PrintJob.cpp b/src/slic3r/GUI/Jobs/PrintJob.cpp index 2dea8801b5..265014c7e4 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.cpp +++ b/src/slic3r/GUI/Jobs/PrintJob.cpp @@ -16,6 +16,25 @@ #include "slic3r/Utils/FileTransferUtils.hpp" #include "slic3r/Utils/BBLNetworkPlugin.hpp" #include "NetworkAgent.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevStorage.h" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/PrintJob.hpp b/src/slic3r/GUI/Jobs/PrintJob.hpp index 4be68031d9..4207824471 100644 --- a/src/slic3r/GUI/Jobs/PrintJob.hpp +++ b/src/slic3r/GUI/Jobs/PrintJob.hpp @@ -3,6 +3,11 @@ #include #include +#include +#include +#include +#include +#include #include "libslic3r/PrintConfig.hpp" #include "Job.hpp" #include "slic3r/GUI/DeviceCore/DevStorage.h" diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp index 7f8219008f..72dc7419f3 100644 --- a/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp +++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.cpp @@ -11,6 +11,12 @@ #include "slic3r/GUI/GUI_App.hpp" #include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp index 5e462c6cc1..1c27df3e54 100644 --- a/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp +++ b/src/slic3r/GUI/Jobs/RotoptimizeJob.hpp @@ -6,6 +6,14 @@ #include "libslic3r/SLA/Rotfinder.hpp" #include "libslic3r/PrintConfig.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.cpp b/src/slic3r/GUI/Jobs/SLAImportJob.cpp index ef1d957441..d592bcbe21 100644 --- a/src/slic3r/GUI/Jobs/SLAImportJob.cpp +++ b/src/slic3r/GUI/Jobs/SLAImportJob.cpp @@ -10,6 +10,15 @@ #include "libslic3r/Model.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SLAImportJob.hpp b/src/slic3r/GUI/Jobs/SLAImportJob.hpp index 4ea25bc752..c8f053260d 100644 --- a/src/slic3r/GUI/Jobs/SLAImportJob.hpp +++ b/src/slic3r/GUI/Jobs/SLAImportJob.hpp @@ -3,6 +3,9 @@ #include "Job.hpp" #include "libslic3r/Point.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SendJob.cpp b/src/slic3r/GUI/Jobs/SendJob.cpp index a06144878c..9a155e6a85 100644 --- a/src/slic3r/GUI/Jobs/SendJob.cpp +++ b/src/slic3r/GUI/Jobs/SendJob.cpp @@ -1,4 +1,6 @@ #include "SendJob.hpp" +#include "json_diff.hpp" +#include "bambu_networking.hpp" #include "libslic3r/LifecycleEvents.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/Utils/NetworkAgent.hpp" @@ -9,6 +11,15 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/format.hpp" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/DeviceCore/DevStorage.h" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/SendJob.hpp b/src/slic3r/GUI/Jobs/SendJob.hpp index 86d180ac8c..c77efe69bb 100644 --- a/src/slic3r/GUI/Jobs/SendJob.hpp +++ b/src/slic3r/GUI/Jobs/SendJob.hpp @@ -3,6 +3,10 @@ #include #include +#include +#include +#include +#include #include "slic3r/GUI/DeviceCore/DevStorage.h" #include "Job.hpp" #include "PrintJob.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp index 25a6eeb301..03b4b14fc1 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.cpp @@ -1,6 +1,14 @@ #include "TextureDisplacementBakeJob.hpp" #include +#include +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include #include "libslic3r/Model.hpp" #include "libslic3r/format.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp index 187df3d0e7..43358e40e3 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementBakeJob.hpp @@ -1,7 +1,10 @@ #ifndef slic3r_TextureDisplacementBakeJob_hpp_ #define slic3r_TextureDisplacementBakeJob_hpp_ +#include +#include #include +#include "libslic3r/Point.hpp" #include #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp index 97958ead9d..10709a8346 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.cpp @@ -6,6 +6,16 @@ #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/Plater.hpp" +#include +#include +#include "libslic3r/TextureBake/TextureBakeDebug.hpp" +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp index 0e7ca5c8a2..91e0621985 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementDebugJob.hpp @@ -1,7 +1,10 @@ #ifndef slic3r_TextureDisplacementDebugJob_hpp_ #define slic3r_TextureDisplacementDebugJob_hpp_ +#include +#include #include +#include "libslic3r/Point.hpp" #include #include "libslic3r/ObjectID.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp index 4494594c7d..24dcc2baa6 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.cpp @@ -1,7 +1,16 @@ #include "TextureDisplacementPrepareJob.hpp" #include +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include +#include #include +#include +#include +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/TriangleSelector.hpp" diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp index efe6a8ce75..c1d51a0c6b 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPrepareJob.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_TextureDisplacementPrepareJob_hpp_ #define slic3r_TextureDisplacementPrepareJob_hpp_ +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp index 1845314f0d..e8c7dfca01 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.cpp @@ -2,6 +2,13 @@ #include "slic3r/GUI/I18N.hpp" #include "slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/TextureDisplacement.hpp" +#include namespace Slic3r::GUI { diff --git a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp index 312cf6593e..5aa5d82d16 100644 --- a/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp +++ b/src/slic3r/GUI/Jobs/TextureDisplacementPreviewJob.hpp @@ -3,7 +3,9 @@ #include #include +#include #include +#include "libslic3r/Point.hpp" #include #include diff --git a/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp b/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp index 3ee1672bde..074bf1de5c 100644 --- a/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp +++ b/src/slic3r/GUI/Jobs/ThreadSafeQueue.hpp @@ -1,6 +1,9 @@ #ifndef THREADSAFEQUEUE_HPP #define THREADSAFEQUEUE_HPP +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp index 7090f0e2e0..d5cb7f4aae 100644 --- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp +++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp @@ -4,6 +4,12 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "slic3r/Utils/Http.hpp" +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp index 3e634e0337..5b6288ff6a 100644 --- a/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp +++ b/src/slic3r/GUI/Jobs/UpgradeNetworkJob.hpp @@ -3,8 +3,11 @@ #include #include +#include #include #include "Job.hpp" +#include +#include #include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/Jobs/Worker.hpp b/src/slic3r/GUI/Jobs/Worker.hpp index 3a29d49e8a..428829716e 100644 --- a/src/slic3r/GUI/Jobs/Worker.hpp +++ b/src/slic3r/GUI/Jobs/Worker.hpp @@ -1,7 +1,10 @@ #ifndef PRUSALSICER_WORKER_HPP #define PRUSALSICER_WORKER_HPP +#include #include +#include +#include #include "Job.hpp" diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index 63580387a7..f7c0f23ae8 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -4,6 +4,20 @@ #include "libslic3r/Utils.hpp" #include "GUI.hpp" #include "Notebook.hpp" +#include +#include "slic3r/GUI/Shortcuts.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include #include #include #include @@ -20,6 +34,9 @@ #include "Widgets/StaticLine.hpp" #include "Widgets/TabCtrl.hpp" #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/KBShortcutsDialog.hpp b/src/slic3r/GUI/KBShortcutsDialog.hpp index 3091726147..4be3967eb1 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.hpp +++ b/src/slic3r/GUI/KBShortcutsDialog.hpp @@ -1,6 +1,12 @@ #ifndef slic3r_GUI_KBShortcutsDialog_hpp_ #define slic3r_GUI_KBShortcutsDialog_hpp_ +#include +#include +#include +#include "slic3r/GUI/KeyChord.hpp" +#include +#include #include #include #include diff --git a/src/slic3r/GUI/KeyChord.cpp b/src/slic3r/GUI/KeyChord.cpp index f6aeacd3ce..768e503486 100644 --- a/src/slic3r/GUI/KeyChord.cpp +++ b/src/slic3r/GUI/KeyChord.cpp @@ -3,6 +3,11 @@ #include "GUI.hpp" #include "I18N.hpp" +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/KeyChord.hpp b/src/slic3r/GUI/KeyChord.hpp index c2cfb88883..36d1ca8d16 100644 --- a/src/slic3r/GUI/KeyChord.hpp +++ b/src/slic3r/GUI/KeyChord.hpp @@ -1,5 +1,6 @@ #pragma once +#include #include #include diff --git a/src/slic3r/GUI/Lazy.cpp b/src/slic3r/GUI/Lazy.cpp index 2a1a74510a..27e0844568 100644 --- a/src/slic3r/GUI/Lazy.cpp +++ b/src/slic3r/GUI/Lazy.cpp @@ -1,6 +1,9 @@ #include "Lazy.hpp" #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp index 8a3c497eae..7c9d6e651d 100644 --- a/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp +++ b/src/slic3r/GUI/LibVGCode/LibVGCodeWrapper.cpp @@ -2,12 +2,18 @@ ///|/ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ +#include #include #include +#include #include #include #include #include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include #include "libslic3r/libslic3r.h" #include "LibVGCodeWrapper.hpp" diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 08da15d3e3..f8f1fcc199 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -1,6 +1,54 @@ #include "MainFrame.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/BBLTopbar.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include "slic3r/GUI/GLToolbar.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include "slic3r/GUI/Project.hpp" +#include +#include "slic3r/GUI/LazyPage.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/PrinterWebView.hpp" +#include "slic3r/GUI/MultiMachinePage.hpp" +#include "slic3r/GUI/CalibrationPanel.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "libslic3r/PublishSettings.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/FilamentGroupPopup.hpp" +#include "slic3r/GUI/Widgets/SideMenuPopup.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include +#include +#include "slic3r/GUI/Lazy.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/calib_dlg.hpp" #include +#include #include #include #include @@ -13,11 +61,13 @@ //#include #include #include +#include #include #include #include #include +#include #include "libslic3r/Print.hpp" #include "libslic3r/Polygon.hpp" @@ -30,6 +80,7 @@ #include "3DScene.hpp" #include "ParamsDialog.hpp" #include "PrintHostDialogs.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include "GUI_ObjectList.hpp" #include "Mouse3DController.hpp" diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp index 0033f41a18..8c4fc58d03 100644 --- a/src/slic3r/GUI/MainFrame.hpp +++ b/src/slic3r/GUI/MainFrame.hpp @@ -3,10 +3,21 @@ #include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Lazy.hpp" +#include +#include +#include +#include #include +#include +#include #include +#include #include #include +#include #ifdef __APPLE__ #include #endif // __APPLE__ diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp index a22f4da87f..70422a4232 100644 --- a/src/slic3r/GUI/MarkdownTip.cpp +++ b/src/slic3r/GUI/MarkdownTip.cpp @@ -7,7 +7,21 @@ #include "libslic3r/Utils.hpp" #include "I18N.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/MarkdownTip.hpp b/src/slic3r/GUI/MarkdownTip.hpp index 0b28ea091f..adbb26721d 100644 --- a/src/slic3r/GUI/MarkdownTip.hpp +++ b/src/slic3r/GUI/MarkdownTip.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_MarkdownTip_hpp_ #define slic3r_MarkdownTip_hpp_ +#include +#include #include #include #include diff --git a/src/slic3r/GUI/MediaFilePanel.cpp b/src/slic3r/GUI/MediaFilePanel.cpp index e9e1f56b03..23aff37f77 100644 --- a/src/slic3r/GUI/MediaFilePanel.cpp +++ b/src/slic3r/GUI/MediaFilePanel.cpp @@ -4,6 +4,7 @@ #include "GUI_App.hpp" #include "GUI.hpp" #include "DeviceManager.hpp" +#include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" #include "Plater.hpp" #include "Widgets/Button.hpp" @@ -12,8 +13,30 @@ #include "Printer/PrinterFileSystem.h" #include "MsgDialog.hpp" #include "Widgets/ProgressDialog.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Semver.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" #include "DeviceCore/DevStorage.h" #ifdef __WXMSW__ diff --git a/src/slic3r/GUI/MediaFilePanel.h b/src/slic3r/GUI/MediaFilePanel.h index 36696d2225..cdf6bf7df1 100644 --- a/src/slic3r/GUI/MediaFilePanel.h +++ b/src/slic3r/GUI/MediaFilePanel.h @@ -8,12 +8,17 @@ #ifndef MediaFilePanel_h #define MediaFilePanel_h +#include +#include #include #include "GUI_Utils.hpp" #include "wxExtensions.hpp" +#include +#include #include +#include class Button; class SwitchButton; diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index c854683368..d7a80a7823 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -1,4 +1,5 @@ #include "MediaPlayCtrl.h" +#include "PrinterNetworkTypes.hpp" #include "WebMediaController.hpp" #include "IPrinterAgent.hpp" #include "Widgets/Button.hpp" @@ -8,6 +9,7 @@ #include "GUI.hpp" #include "DeviceManager.hpp" #include "DeviceCore/DevConfigUtil.h" +#include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" #include "slic3r/Utils/NetworkAgentFactory.hpp" #include "libslic3r/Thread.hpp" @@ -20,13 +22,46 @@ #include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/wxMediaCtrl3.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp" #include +#include +#include +#include #undef pid_t #include #ifdef __WIN32__ diff --git a/src/slic3r/GUI/MediaPlayCtrl.h b/src/slic3r/GUI/MediaPlayCtrl.h index 1d426fc685..8a8a15d474 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.h +++ b/src/slic3r/GUI/MediaPlayCtrl.h @@ -13,6 +13,14 @@ #include "WebRtcMediaController.hpp" #include "slic3r/Utils/IPrinterAgent.hpp" +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -20,6 +28,7 @@ #include #include +#include class Button; class Label; diff --git a/src/slic3r/GUI/MeshUtils.cpp b/src/slic3r/GUI/MeshUtils.cpp index 173c5d2f13..db7f9aa5f2 100644 --- a/src/slic3r/GUI/MeshUtils.cpp +++ b/src/slic3r/GUI/MeshUtils.cpp @@ -14,11 +14,31 @@ #include "slic3r/GUI/CameraUtils.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include "libslic3r/AnyPtr.hpp" +#include +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Color.hpp" +#include +#include "slic3r/GUI/GLShader.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/AABBMesh.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/MeshUtils.hpp b/src/slic3r/GUI/MeshUtils.hpp index 679c0e2a97..4eed2c422a 100644 --- a/src/slic3r/GUI/MeshUtils.hpp +++ b/src/slic3r/GUI/MeshUtils.hpp @@ -11,9 +11,20 @@ #include "slic3r/GUI/GLModel.hpp" +#include +#include #include +#include "libslic3r/AnyPtr.hpp" +#include "libslic3r/libslic3r.h" +#include +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/CSGMesh/CSGMesh.hpp" +#include "libslic3r/ExPolygon.hpp" #include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MixedFilamentDialog.cpp b/src/slic3r/GUI/MixedFilamentDialog.cpp index 246c6548c6..314570f126 100644 --- a/src/slic3r/GUI/MixedFilamentDialog.cpp +++ b/src/slic3r/GUI/MixedFilamentDialog.cpp @@ -2,16 +2,36 @@ #include #include +#include +#include #include #include #include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include #include +#include #include #include #include #include #include +#include #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/MixedFilamentDialog.hpp b/src/slic3r/GUI/MixedFilamentDialog.hpp index 381896494e..2e94b0c6e7 100644 --- a/src/slic3r/GUI/MixedFilamentDialog.hpp +++ b/src/slic3r/GUI/MixedFilamentDialog.hpp @@ -2,11 +2,17 @@ #define slic3r_MixedFilamentDialog_hpp_ #include +#include #include #include #include #include +#include +#include +#include #include +#include +#include #include #include diff --git a/src/slic3r/GUI/ModelMall.cpp b/src/slic3r/GUI/ModelMall.cpp index 3de5da4613..bae46f2dcd 100644 --- a/src/slic3r/GUI/ModelMall.cpp +++ b/src/slic3r/GUI/ModelMall.cpp @@ -1,6 +1,20 @@ #include "ModelMall.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/WebView.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include #include #include #include diff --git a/src/slic3r/GUI/ModelMall.hpp b/src/slic3r/GUI/ModelMall.hpp index 06b6ebbfe3..7c7c2280b4 100644 --- a/src/slic3r/GUI/ModelMall.hpp +++ b/src/slic3r/GUI/ModelMall.hpp @@ -3,9 +3,14 @@ #include "I18N.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include #include #include +#include +#include #include +#include #include #include #include @@ -15,6 +20,7 @@ #include #include #include +#include #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" diff --git a/src/slic3r/GUI/Monitor.cpp b/src/slic3r/GUI/Monitor.cpp index 91bbbf8930..b05ededd62 100644 --- a/src/slic3r/GUI/Monitor.cpp +++ b/src/slic3r/GUI/Monitor.cpp @@ -5,13 +5,32 @@ #include "slic3r/Utils/bambu_networking.hpp" #include "slic3r/Utils/NetworkAgent.hpp" +#include "slic3r/GUI/Monitor.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Field.hpp" +#include +#include "slic3r/GUI/SelectMachinePop.hpp" +#include "slic3r/GUI/HMSPanel.hpp" +#include "slic3r/GUI/Tabbook.hpp" +#include "slic3r/GUI/StatusPanel.hpp" +#include "slic3r/GUI/UpgradePanel.hpp" +#include "slic3r/GUI/Widgets/SideTools.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include +#include #include +#include +#include +#include +#include #include #include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Monitor.hpp b/src/slic3r/GUI/Monitor.hpp index 94474f73b0..ce7fcf0570 100644 --- a/src/slic3r/GUI/Monitor.hpp +++ b/src/slic3r/GUI/Monitor.hpp @@ -2,11 +2,17 @@ #define slic3r_Monitor_hpp_ #include "Tabbook.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/StagedBuild.hpp" +#include #include #include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/MonitorBasePanel.cpp b/src/slic3r/GUI/MonitorBasePanel.cpp index a63a86f997..21a49a4c65 100644 --- a/src/slic3r/GUI/MonitorBasePanel.cpp +++ b/src/slic3r/GUI/MonitorBasePanel.cpp @@ -8,6 +8,17 @@ #include "MonitorBasePanel.h" #include "Printer/PrinterFileSystem.h" #include "Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" /////////////////////////////////////////////////////////////////////////// using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/MonitorBasePanel.h b/src/slic3r/GUI/MonitorBasePanel.h index 42424a7187..fbfeec60c6 100644 --- a/src/slic3r/GUI/MonitorBasePanel.h +++ b/src/slic3r/GUI/MonitorBasePanel.h @@ -7,7 +7,9 @@ #pragma once +#include #include +#include #include #include #include diff --git a/src/slic3r/GUI/MonitorPage.cpp b/src/slic3r/GUI/MonitorPage.cpp index 74fee260d1..54a9289b5b 100644 --- a/src/slic3r/GUI/MonitorPage.cpp +++ b/src/slic3r/GUI/MonitorPage.cpp @@ -1,4 +1,8 @@ #include "MonitorPage.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MonitorPage.hpp b/src/slic3r/GUI/MonitorPage.hpp index 3efaccda31..9e6e86e82d 100644 --- a/src/slic3r/GUI/MonitorPage.hpp +++ b/src/slic3r/GUI/MonitorPage.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_MonitorPage_hpp_ #define slic3r_MonitorPage_hpp_ +#include +#include #include #include diff --git a/src/slic3r/GUI/Mouse3DController.cpp b/src/slic3r/GUI/Mouse3DController.cpp index 0317342412..161bfa7730 100644 --- a/src/slic3r/GUI/Mouse3DController.cpp +++ b/src/slic3r/GUI/Mouse3DController.cpp @@ -9,6 +9,23 @@ #include "Plater.hpp" #include "NotificationManager.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Mouse3DController.hpp b/src/slic3r/GUI/Mouse3DController.hpp index 9fb9cf68c8..ac6a2b9b9f 100644 --- a/src/slic3r/GUI/Mouse3DController.hpp +++ b/src/slic3r/GUI/Mouse3DController.hpp @@ -2,6 +2,12 @@ #define slic3r_Mouse3DController_hpp_ // Enabled debug output to console and extended imgui dialog +#include +#include +#include +#include +#include +#include #define ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT 0 #include "libslic3r/Point.hpp" diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp index 8c981a970f..cc5d97b358 100644 --- a/src/slic3r/GUI/MsgDialog.cpp +++ b/src/slic3r/GUI/MsgDialog.cpp @@ -1,5 +1,28 @@ #include "MsgDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Semver.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include #include #include #include @@ -16,6 +39,10 @@ #include #include #include +#include +#include +#include +#include #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" @@ -23,6 +50,7 @@ #include "GUI.hpp" #include "I18N.hpp" //#include "ConfigWizard.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include "Widgets/Label.hpp" #include "slic3r/GUI/MainFrame.hpp" diff --git a/src/slic3r/GUI/MsgDialog.hpp b/src/slic3r/GUI/MsgDialog.hpp index ed8079d88c..21ad283d0a 100644 --- a/src/slic3r/GUI/MsgDialog.hpp +++ b/src/slic3r/GUI/MsgDialog.hpp @@ -1,16 +1,25 @@ #ifndef slic3r_MsgDialog_hpp_ #define slic3r_MsgDialog_hpp_ +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" #include #include #include "GUI_Utils.hpp" +#include #include +#include #include #include +#include +#include #include #include +#include #include #include +#include #include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/TextInput.hpp" diff --git a/src/slic3r/GUI/MultiChoiceDialog.cpp b/src/slic3r/GUI/MultiChoiceDialog.cpp index 6bd5412737..e106d7869f 100644 --- a/src/slic3r/GUI/MultiChoiceDialog.cpp +++ b/src/slic3r/GUI/MultiChoiceDialog.cpp @@ -2,6 +2,18 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/CheckList.hpp" +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiChoiceDialog.hpp b/src/slic3r/GUI/MultiChoiceDialog.hpp index f636bebd3b..a069c5e0df 100644 --- a/src/slic3r/GUI/MultiChoiceDialog.hpp +++ b/src/slic3r/GUI/MultiChoiceDialog.hpp @@ -4,6 +4,11 @@ #include "Widgets/CheckList.hpp" #include "Widgets/DialogButtons.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/MultiMachine.cpp b/src/slic3r/GUI/MultiMachine.cpp index df6ccc1298..bbae95b37b 100644 --- a/src/slic3r/GUI/MultiMachine.cpp +++ b/src/slic3r/GUI/MultiMachine.cpp @@ -3,6 +3,10 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachine.hpp b/src/slic3r/GUI/MultiMachine.hpp index b38918225c..40ad2a0e61 100644 --- a/src/slic3r/GUI/MultiMachine.hpp +++ b/src/slic3r/GUI/MultiMachine.hpp @@ -3,7 +3,13 @@ #include "GUI_Utils.hpp" #include "DeviceManager.hpp" +#include #include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachineManagerPage.cpp b/src/slic3r/GUI/MultiMachineManagerPage.cpp index f68188a9f1..35a1b99b6a 100644 --- a/src/slic3r/GUI/MultiMachineManagerPage.cpp +++ b/src/slic3r/GUI/MultiMachineManagerPage.cpp @@ -3,6 +3,34 @@ #include "MainFrame.hpp" #include "DeviceCore/DevManager.h" +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include "slic3r/GUI/Monitor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/MultiMachinePage.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachineManagerPage.hpp b/src/slic3r/GUI/MultiMachineManagerPage.hpp index 9b5655a9ee..b0850219c9 100644 --- a/src/slic3r/GUI/MultiMachineManagerPage.hpp +++ b/src/slic3r/GUI/MultiMachineManagerPage.hpp @@ -6,6 +6,15 @@ #include "wxExtensions.hpp" #include "Widgets/Button.hpp" #include "Widgets/TextInput.hpp" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachinePage.cpp b/src/slic3r/GUI/MultiMachinePage.cpp index 2b6fe75f34..3238a7a723 100644 --- a/src/slic3r/GUI/MultiMachinePage.cpp +++ b/src/slic3r/GUI/MultiMachinePage.cpp @@ -3,6 +3,29 @@ #include "MainFrame.hpp" #include "DeviceCore/DevManager.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiMachinePage.hpp b/src/slic3r/GUI/MultiMachinePage.hpp index 14d531e8ab..ec23bd7d58 100644 --- a/src/slic3r/GUI/MultiMachinePage.hpp +++ b/src/slic3r/GUI/MultiMachinePage.hpp @@ -10,6 +10,19 @@ #include "Lazy.hpp" #include "wx/button.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiSendMachineModel.cpp b/src/slic3r/GUI/MultiSendMachineModel.cpp index f7861516e4..c74de6aa50 100644 --- a/src/slic3r/GUI/MultiSendMachineModel.cpp +++ b/src/slic3r/GUI/MultiSendMachineModel.cpp @@ -1,6 +1,9 @@ #include "MultiSendMachineModel.hpp" #include "GUI.hpp" +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/MultiTaskManagerPage.cpp b/src/slic3r/GUI/MultiTaskManagerPage.cpp index d063b34743..df639bb029 100644 --- a/src/slic3r/GUI/MultiTaskManagerPage.cpp +++ b/src/slic3r/GUI/MultiTaskManagerPage.cpp @@ -4,8 +4,44 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" #include "Widgets/RadioBox.hpp" +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/MultiMachineManagerPage.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/MultiMachinePage.hpp" +#include +#include "slic3r/GUI/TaskManager.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "DeviceCore/DevManager.h" diff --git a/src/slic3r/GUI/MultiTaskManagerPage.hpp b/src/slic3r/GUI/MultiTaskManagerPage.hpp index f1b35ca2aa..f03da412d1 100644 --- a/src/slic3r/GUI/MultiTaskManagerPage.hpp +++ b/src/slic3r/GUI/MultiTaskManagerPage.hpp @@ -13,6 +13,16 @@ #include "Widgets/ScrolledWindow.hpp" #include "Widgets/PopupWindow.hpp" #include "Widgets/TextInput.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NativeCommands.cpp b/src/slic3r/GUI/NativeCommands.cpp index 1297cd4a24..1725c94fcc 100644 --- a/src/slic3r/GUI/NativeCommands.cpp +++ b/src/slic3r/GUI/NativeCommands.cpp @@ -19,6 +19,9 @@ #include "PlateSettingsDialog.hpp" #include "DeviceCore/DevManager.h" +#include "libslic3r/Config.hpp" +#include +#include #include #include @@ -26,11 +29,15 @@ #include #include #include +#include "libslic3r/libslic3r.h" #include +#include "slic3r/GUI/ActionRegistry.hpp" #include #include #include +#include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NetworkPluginDialog.cpp b/src/slic3r/GUI/NetworkPluginDialog.cpp index 42e1fc5fc5..be5a0f1f53 100644 --- a/src/slic3r/GUI/NetworkPluginDialog.cpp +++ b/src/slic3r/GUI/NetworkPluginDialog.cpp @@ -9,9 +9,20 @@ #include "wxExtensions.hpp" #include "slic3r/Utils/bambu_networking.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" #include #include #include +#include +#include #define BORDER_W FromDIP(20) #define TEXT_WRAP FromDIP(400) diff --git a/src/slic3r/GUI/NetworkPluginDialog.hpp b/src/slic3r/GUI/NetworkPluginDialog.hpp index 6c7585411a..202ec9fb8c 100644 --- a/src/slic3r/GUI/NetworkPluginDialog.hpp +++ b/src/slic3r/GUI/NetworkPluginDialog.hpp @@ -6,7 +6,11 @@ #include "Widgets/ComboBox.hpp" #include "Widgets/Button.hpp" #include "slic3r/Utils/bambu_networking.hpp" +#include +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NetworkTestDialog.cpp b/src/slic3r/GUI/NetworkTestDialog.cpp index 53876d9f97..c1ce56b863 100644 --- a/src/slic3r/GUI/NetworkTestDialog.cpp +++ b/src/slic3r/GUI/NetworkTestDialog.cpp @@ -5,10 +5,26 @@ #include "GUI.hpp" #include "GUI_App.hpp" #include "I18N.hpp" +#include "libslic3r_version.h" #include "slic3r/Utils/Http.hpp" #include "libslic3r/AppConfig.hpp" #include #include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/NetworkTestDialog.hpp b/src/slic3r/GUI/NetworkTestDialog.hpp index 7a0622bcd4..cb1afe8377 100644 --- a/src/slic3r/GUI/NetworkTestDialog.hpp +++ b/src/slic3r/GUI/NetworkTestDialog.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_NetworkTestDialog_hpp_ #define slic3r_GUI_NetworkTestDialog_hpp_ +#include #include #include diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp index 7b69effacc..54c188fa38 100644 --- a/src/slic3r/GUI/Notebook.cpp +++ b/src/slic3r/GUI/Notebook.cpp @@ -9,9 +9,19 @@ //BBS set font size #include "Widgets/Label.hpp" +#include +#include +#include +#include +#include +#include #include +#include #include +#include +#include #include +#include wxDEFINE_EVENT(wxCUSTOMEVT_NOTEBOOK_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Notebook.hpp b/src/slic3r/GUI/Notebook.hpp index cc6ad91f21..1153161856 100644 --- a/src/slic3r/GUI/Notebook.hpp +++ b/src/slic3r/GUI/Notebook.hpp @@ -3,12 +3,21 @@ //#ifdef _WIN32 +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include class ScalableButton; class Button; diff --git a/src/slic3r/GUI/NotificationManager.cpp b/src/slic3r/GUI/NotificationManager.cpp index e6172135a6..cc391df8b5 100644 --- a/src/slic3r/GUI/NotificationManager.cpp +++ b/src/slic3r/GUI/NotificationManager.cpp @@ -14,14 +14,41 @@ #include "libslic3r/PrintBase.hpp" #include "format.hpp" +#include #include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include "libslic3r/Preset.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GLCanvas3D.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include "slic3r/GUI/Downloader.hpp" +#include +#include +#include "libslic3r/Model.hpp" +#include +#include "slic3r/GUI/Plater.hpp" #include +#include +#include #include "GUI_App.hpp" #include "FilamentMapDialog.hpp" diff --git a/src/slic3r/GUI/NotificationManager.hpp b/src/slic3r/GUI/NotificationManager.hpp index cb65524dac..2613d3da9a 100644 --- a/src/slic3r/GUI/NotificationManager.hpp +++ b/src/slic3r/GUI/NotificationManager.hpp @@ -9,9 +9,16 @@ #include "Jobs/ProgressIndicator.hpp" #include "Downloader.hpp" +#include +#include +#include #include +#include "libslic3r/PrintBase.hpp" #include +#include +#include +#include #include #include @@ -22,6 +29,7 @@ #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OAuthDialog.cpp b/src/slic3r/GUI/OAuthDialog.cpp index 40b5216832..66dd3c8970 100644 --- a/src/slic3r/GUI/OAuthDialog.cpp +++ b/src/slic3r/GUI/OAuthDialog.cpp @@ -5,6 +5,16 @@ #include "Jobs/PlaterWorker.hpp" #include "wxExtensions.hpp" #include "Widgets/DialogButtons.hpp" +#include "slic3r/GUI/Jobs/OAuthJob.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OAuthDialog.hpp b/src/slic3r/GUI/OAuthDialog.hpp index 3301cd9997..199d8f1c9c 100644 --- a/src/slic3r/GUI/OAuthDialog.hpp +++ b/src/slic3r/GUI/OAuthDialog.hpp @@ -4,6 +4,8 @@ #include "GUI_Utils.hpp" #include "Jobs/OAuthJob.hpp" #include "Jobs/Worker.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OG_CustomCtrl.cpp b/src/slic3r/GUI/OG_CustomCtrl.cpp index 4fce046162..890e85fa9f 100644 --- a/src/slic3r/GUI/OG_CustomCtrl.cpp +++ b/src/slic3r/GUI/OG_CustomCtrl.cpp @@ -6,12 +6,32 @@ #include "MsgDialog.hpp" #include "libslic3r/AppConfig.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Config.hpp" +#include #include #include #include "libslic3r/Utils.hpp" #include "I18N.hpp" #include "format.hpp" #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OG_CustomCtrl.hpp b/src/slic3r/GUI/OG_CustomCtrl.hpp index a9c5326618..c0ea80c172 100644 --- a/src/slic3r/GUI/OG_CustomCtrl.hpp +++ b/src/slic3r/GUI/OG_CustomCtrl.hpp @@ -1,11 +1,23 @@ #ifndef slic3r_OG_CustomCtrl_hpp_ #define slic3r_OG_CustomCtrl_hpp_ +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include #include #include #include #include +#include +#include +#include #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/ObjColorDialog.cpp b/src/slic3r/GUI/ObjColorDialog.cpp index 4388449bb5..e43b78762a 100644 --- a/src/slic3r/GUI/ObjColorDialog.cpp +++ b/src/slic3r/GUI/ObjColorDialog.cpp @@ -1,4 +1,19 @@ #include +#include "libslic3r/TriangleSelector.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Format/OBJ.hpp" +#include +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/GuiColor.hpp" +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/Camera.hpp" #include //#include "libslic3r/FlushVolCalc.hpp" #include "ObjColorDialog.hpp" @@ -13,7 +28,22 @@ #include "BitmapComboBox.hpp" #include "Widgets/ComboBox.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "libslic3r/ObjColorUtils.hpp" #include "libslic3r/Model.hpp" diff --git a/src/slic3r/GUI/ObjColorDialog.hpp b/src/slic3r/GUI/ObjColorDialog.hpp index 34f9eb5de5..ffe27f8b58 100644 --- a/src/slic3r/GUI/ObjColorDialog.hpp +++ b/src/slic3r/GUI/ObjColorDialog.hpp @@ -5,6 +5,15 @@ #include "Camera.hpp" #include "GuiColor.hpp" #include "libslic3r/Format/OBJ.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp index a20dc50877..eea00e57e6 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.cpp +++ b/src/slic3r/GUI/ObjectDataViewModel.cpp @@ -10,8 +10,28 @@ #include "libslic3r/Model.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/ExtraRenderers.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ObjectDataViewModel.hpp b/src/slic3r/GUI/ObjectDataViewModel.hpp index 137863a36c..25cea565a6 100644 --- a/src/slic3r/GUI/ObjectDataViewModel.hpp +++ b/src/slic3r/GUI/ObjectDataViewModel.hpp @@ -2,9 +2,18 @@ #define slic3r_GUI_ObjectDataViewModel_hpp_ #include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include #include "ExtraRenderers.hpp" diff --git a/src/slic3r/GUI/OpenGLManager.cpp b/src/slic3r/GUI/OpenGLManager.cpp index 0fc8ce9c6e..0224de1b8a 100644 --- a/src/slic3r/GUI/OpenGLManager.cpp +++ b/src/slic3r/GUI/OpenGLManager.cpp @@ -8,14 +8,28 @@ #include "libslic3r/AppConfig.hpp" #include "libslic3r/Platform.hpp" +#include +#include +#include +#include #include #include #include #include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include #include +#include #include +#include +#include #include "GUI_Init.hpp" diff --git a/src/slic3r/GUI/OpenGLManager.hpp b/src/slic3r/GUI/OpenGLManager.hpp index b9ba064a59..ebd44170cb 100644 --- a/src/slic3r/GUI/OpenGLManager.hpp +++ b/src/slic3r/GUI/OpenGLManager.hpp @@ -2,6 +2,9 @@ #define slic3r_OpenGLManager_hpp_ #include "GLShadersManager.hpp" +#include +#include +#include "slic3r/GUI/GLShader.hpp" class wxWindow; class wxGLCanvas; diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 84e6fc43c3..711a95e209 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -11,11 +11,25 @@ #include "Widgets/StaticLine.hpp" #include "Widgets/LabeledStaticBox.hpp" +#include #include +#include +#include +#include #include +#include "slic3r/GUI/Field.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/plugin/PluginDescriptor.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/PrintConfig.hpp" #include +#include #include +#include #include +#include +#include #include #include #include @@ -26,6 +40,9 @@ #include "I18N.hpp" #include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/OptionsGroup.hpp b/src/slic3r/GUI/OptionsGroup.hpp index 8dde661bdd..63ebee7176 100644 --- a/src/slic3r/GUI/OptionsGroup.hpp +++ b/src/slic3r/GUI/OptionsGroup.hpp @@ -1,11 +1,20 @@ #ifndef slic3r_OptionsGroup_hpp_ #define slic3r_OptionsGroup_hpp_ +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include "libslic3r/Config.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/ParamsDialog.cpp b/src/slic3r/GUI/ParamsDialog.cpp index 740df52049..87888848a6 100644 --- a/src/slic3r/GUI/ParamsDialog.cpp +++ b/src/slic3r/GUI/ParamsDialog.cpp @@ -6,6 +6,16 @@ #include "Tab.hpp" #include "libslic3r/Utils.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Event.hpp" namespace pt = boost::property_tree; typedef pt::ptree JSON; diff --git a/src/slic3r/GUI/ParamsDialog.hpp b/src/slic3r/GUI/ParamsDialog.hpp index 1c8a25a26a..9ad34e165e 100644 --- a/src/slic3r/GUI/ParamsDialog.hpp +++ b/src/slic3r/GUI/ParamsDialog.hpp @@ -1,6 +1,11 @@ #ifndef slic3r_GUI_ParamsDialog_hpp_ #define slic3r_GUI_ParamsDialog_hpp_ +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 9e16fcf8df..674bbcd54f 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -17,6 +17,27 @@ #include "Widgets/SwitchButton.hpp" #include "Widgets/Button.hpp" #include "GUI_Factories.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp index f4e151456d..8ae3c34fa3 100644 --- a/src/slic3r/GUI/ParamsPanel.hpp +++ b/src/slic3r/GUI/ParamsPanel.hpp @@ -3,11 +3,14 @@ #include +#include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PartPlate.cpp b/src/slic3r/GUI/PartPlate.cpp index 8e2d6ba37b..41233ebc3b 100644 --- a/src/slic3r/GUI/PartPlate.cpp +++ b/src/slic3r/GUI/PartPlate.cpp @@ -1,7 +1,56 @@ +#include +#include +#include +#include +#include +#include +#include #include #include +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Line.hpp" +#include "libslic3r/Polyline.hpp" +#include "libslic3r/ExPolygon.hpp" +#include +#include "libslic3r/BuildVolume.hpp" +#include "libslic3r/GCode/WipeTower.hpp" +#include "libslic3r/CustomGCode.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include +#include "libslic3r/Arrange.hpp" +#include "libslic3r/PrintBase.hpp" +#include "libslic3r/Model.hpp" +#include "libslic3r/format.hpp" +#include +#include +#include "libslic3r/ParameterUtils.hpp" +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include "libslic3r/Print.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include #include +#include +#include +#include #include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "slic3r/GUI/GLTexture.hpp" +#include "slic3r/GUI/GLShader.hpp" +#include "slic3r/GUI/OpenGLManager.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include +#include +#include +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/Plater.hpp" +#include "slic3r/GUI/GUI_ObjectLayers.hpp" #include #include #include @@ -48,7 +97,15 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/Utils/FileHelp.hpp" #include +#include #include +#include +#include +#include +#include +#include +#include +#include using boost::optional; namespace fs = boost::filesystem; diff --git a/src/slic3r/GUI/PartPlate.hpp b/src/slic3r/GUI/PartPlate.hpp index 52a277d0e3..fc1aeb7bd7 100644 --- a/src/slic3r/GUI/PartPlate.hpp +++ b/src/slic3r/GUI/PartPlate.hpp @@ -1,11 +1,27 @@ #ifndef __part_plate_hpp_ #define __part_plate_hpp_ +#include +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "libslic3r/PrintBase.hpp" +#include +#include +#include +#include #include #include #include #include #include +#include #include "libslic3r/ObjectID.hpp" #include "libslic3r/GCode/GCodeProcessor.hpp" diff --git a/src/slic3r/GUI/PartSkipDialog.cpp b/src/slic3r/GUI/PartSkipDialog.cpp index 860779ead4..7d7b4a0635 100644 --- a/src/slic3r/GUI/PartSkipDialog.cpp +++ b/src/slic3r/GUI/PartSkipDialog.cpp @@ -1,11 +1,42 @@ #include "GUI_Utils.hpp" #include "GUI_App.hpp" +#include "libslic3r_version.h" #include "slic3r/Utils/NetworkAgent.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/PartSkipCommon.hpp" +#include #include #include #include +#include +#include #include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PartSkipDialog.hpp b/src/slic3r/GUI/PartSkipDialog.hpp index 37697ced31..f1aef1f022 100644 --- a/src/slic3r/GUI/PartSkipDialog.hpp +++ b/src/slic3r/GUI/PartSkipDialog.hpp @@ -1,6 +1,15 @@ +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index 1facddbff1..ffbf98ede2 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -2,12 +2,36 @@ #include "PresetComboBoxes.hpp" #include "PrinterCloudAuthDialog.hpp" +#include +#include +#include +#include #include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/RoundedRectangle.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/OptionsGroup.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "libslic3r/Exception.hpp" #include #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -15,6 +39,7 @@ #include #include #include +#include #include #include "libslic3r/libslic3r.h" @@ -28,6 +53,7 @@ #include "MainFrame.hpp" #include "format.hpp" #include "Tab.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include "PrintHostDialogs.hpp" #include "../Utils/ASCIIFolding.hpp" diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.hpp b/src/slic3r/GUI/PhysicalPrinterDialog.hpp index 276e62416e..fe43bb7d91 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.hpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.hpp @@ -1,8 +1,11 @@ #ifndef slic3r_PhysicalPrinterDialog_hpp_ #define slic3r_PhysicalPrinterDialog_hpp_ +#include "libslic3r/PrintConfig.hpp" +#include #include +#include #include #include "libslic3r/Preset.hpp" diff --git a/src/slic3r/GUI/PlateSettingsDialog.cpp b/src/slic3r/GUI/PlateSettingsDialog.cpp index 07c955ef01..b640b2cb84 100644 --- a/src/slic3r/GUI/PlateSettingsDialog.cpp +++ b/src/slic3r/GUI/PlateSettingsDialog.cpp @@ -1,6 +1,32 @@ #include "PlateSettingsDialog.hpp" #include "MsgDialog.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/FilamentMixer.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "libslic3r/ParameterUtils.hpp" +#include namespace Slic3r { namespace GUI { static constexpr int MIN_LAYER_VALUE = 2; diff --git a/src/slic3r/GUI/PlateSettingsDialog.hpp b/src/slic3r/GUI/PlateSettingsDialog.hpp index b94739348f..1f05b58aeb 100644 --- a/src/slic3r/GUI/PlateSettingsDialog.hpp +++ b/src/slic3r/GUI/PlateSettingsDialog.hpp @@ -8,6 +8,19 @@ #include "Widgets/ComboBox.hpp" #include "DragCanvas.hpp" #include "libslic3r/ParameterUtils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 2622fdbc28..142e4e2482 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -1,16 +1,96 @@ #include "Plater.hpp" #include "../Utils/NetworkAgent.hpp" +#include "IPrinterAgent.hpp" +#include "CalibUtils.hpp" +#include "Flashforge.hpp" #include "libslic3r/Config.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "libslic3r/TriangleSelector.hpp" +#include +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/FlushVolCalc.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/PrintBase.hpp" +#include "libslic3r/Preset.hpp" +#include +#include "libslic3r/calib.hpp" +#include +#include "libslic3r/Format/OBJ.hpp" +#include "libslic3r/Geometry.hpp" +#include "libslic3r/Arrange.hpp" +#include "libslic3r/MultiNozzleUtils.hpp" +#include "libslic3r/Color.hpp" +#include +#include "libslic3r/Exception.hpp" +#include "libslic3r/AppConfig.hpp" +#include "libslic3r/CSGMesh/CSGMesh.hpp" +#include "libslic3r/format.hpp" +#include "libslic3r/MeshBoolean.hpp" #include #include #include +#include "slic3r/GUI/Event.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Search.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/GUI_ObjectSettings.hpp" +#include "slic3r/GUI/ColorDecomposeDialog.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include "slic3r/GUI/Jobs/Job.hpp" +#include "slic3r/GUI/ParamsPanel.hpp" +#include "slic3r/GUI/SceneRaycaster.hpp" +#include "slic3r/GUI/PrinterWebView.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include "slic3r/GUI/UnsavedChangesDialog.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/GUI_Geometry.hpp" +#include "slic3r/GUI/Widgets/DialogButtons.hpp" +#include "slic3r/GUI/PrintOptionsDialog.hpp" +#include "slic3r/GUI/CalibrationPanel.hpp" +#include "slic3r/GUI/CalibrationWizard.hpp" +#include "slic3r/GUI/Monitor.hpp" #include #include #include +#include +#include +#include +#include #include #include #include @@ -27,8 +107,25 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include +#include #include #include #include @@ -38,7 +135,12 @@ #include #include #include +#include #include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Plater.hpp b/src/slic3r/GUI/Plater.hpp index ebff1ff90d..a887805f8a 100644 --- a/src/slic3r/GUI/Plater.hpp +++ b/src/slic3r/GUI/Plater.hpp @@ -1,14 +1,38 @@ #ifndef slic3r_Plater_hpp_ #define slic3r_Plater_hpp_ +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include "libslic3r/Point.hpp" +#include "libslic3r/PublishSettings.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/libslic3r.h" +#include #include +#include "slic3r/GUI/Event.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" #include #include +#include #include +#include +#include #include // BBS #include +#include +#include #include "Selection.hpp" diff --git a/src/slic3r/GUI/PluginPickerDialog.cpp b/src/slic3r/GUI/PluginPickerDialog.cpp index 5109b3b483..1746f18605 100644 --- a/src/slic3r/GUI/PluginPickerDialog.cpp +++ b/src/slic3r/GUI/PluginPickerDialog.cpp @@ -1,9 +1,20 @@ #include "PluginPickerDialog.hpp" +#include +#include "slic3r/plugin/PluginDescriptor.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include #include #include +#include +#include #include #include +#include #include #include "GUI.hpp" diff --git a/src/slic3r/GUI/PluginPickerDialog.hpp b/src/slic3r/GUI/PluginPickerDialog.hpp index 6ae4163c5f..010372cdf9 100644 --- a/src/slic3r/GUI/PluginPickerDialog.hpp +++ b/src/slic3r/GUI/PluginPickerDialog.hpp @@ -1,6 +1,8 @@ #ifndef SLIC3R_GUI_PLUGINPICKERDIALOG_HPP #define SLIC3R_GUI_PLUGINPICKERDIALOG_HPP +#include +#include "slic3r/plugin/PluginDescriptor.hpp" #include #ifndef WX_PRECOMP # include diff --git a/src/slic3r/GUI/PluginProgressDialog.cpp b/src/slic3r/GUI/PluginProgressDialog.cpp index 778cbcde57..aa37655b73 100644 --- a/src/slic3r/GUI/PluginProgressDialog.cpp +++ b/src/slic3r/GUI/PluginProgressDialog.cpp @@ -1,6 +1,10 @@ #include "PluginProgressDialog.hpp" +#include "slic3r/GUI/Widgets/ProgressDialog.hpp" +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PluginSort.hpp b/src/slic3r/GUI/PluginSort.hpp index d0a45cbd05..9321206988 100644 --- a/src/slic3r/GUI/PluginSort.hpp +++ b/src/slic3r/GUI/PluginSort.hpp @@ -7,6 +7,7 @@ #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PluginsConfigDialog.cpp b/src/slic3r/GUI/PluginsConfigDialog.cpp index 9a79588af1..18fb823f38 100644 --- a/src/slic3r/GUI/PluginsConfigDialog.cpp +++ b/src/slic3r/GUI/PluginsConfigDialog.cpp @@ -5,14 +5,23 @@ #include "I18N.hpp" #include "format.hpp" +#include +#include #include #include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" #include #include #include #include #include +#include +#include +#include +#include "slic3r/plugin/PythonPluginInterface.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PluginsConfigDialog.hpp b/src/slic3r/GUI/PluginsConfigDialog.hpp index 616fde17ca..5ff832d348 100644 --- a/src/slic3r/GUI/PluginsConfigDialog.hpp +++ b/src/slic3r/GUI/PluginsConfigDialog.hpp @@ -6,7 +6,9 @@ #include #include +#include "slic3r/plugin/PythonPluginInterface.hpp" #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PluginsDialog.cpp b/src/slic3r/GUI/PluginsDialog.cpp index 6ac04a50da..b9b7b031a4 100644 --- a/src/slic3r/GUI/PluginsDialog.cpp +++ b/src/slic3r/GUI/PluginsDialog.cpp @@ -9,10 +9,19 @@ #include "slic3r/plugin/PluginFsUtils.hpp" #include "slic3r/plugin/PluginManager.hpp" +#include +#include +#include +#include +#include #include #include #include +#include "slic3r/GUI/PluginSource.hpp" +#include "slic3r/GUI/PluginStatus.hpp" +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include "slic3r/GUI/PluginSort.hpp" #include #include @@ -25,13 +34,18 @@ #include #include #include +#include +#include #include +#include #include #include #include +#include #include #include +#include #include #include diff --git a/src/slic3r/GUI/PluginsDialog.hpp b/src/slic3r/GUI/PluginsDialog.hpp index c85e57040c..272acf8a9e 100644 --- a/src/slic3r/GUI/PluginsDialog.hpp +++ b/src/slic3r/GUI/PluginsDialog.hpp @@ -9,6 +9,7 @@ #include "slic3r/plugin/PluginDescriptor.hpp" #include +#include #include #include #include @@ -19,13 +20,17 @@ #include #include #include +#include +#include #include #include +#include #include #include #include #include +#include class wxTimer; diff --git a/src/slic3r/GUI/PostProcessor.cpp b/src/slic3r/GUI/PostProcessor.cpp index cd8592c813..99639e3a8d 100644 --- a/src/slic3r/GUI/PostProcessor.cpp +++ b/src/slic3r/GUI/PostProcessor.cpp @@ -13,6 +13,11 @@ #include "slic3r/plugin/PythonInterpreter.hpp" #include +#include +#include +#include +#include +#include #include #include #include @@ -22,9 +27,21 @@ // BBS #include +#include +#include +#include +#include +#include #include #include +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Print.hpp" +#include "libslic3r/Exception.hpp" #include +#include +#include +#include #ifdef WIN32 diff --git a/src/slic3r/GUI/PrePrintChecker.cpp b/src/slic3r/GUI/PrePrintChecker.cpp index 7d0ae63cf1..c15cfb9cbf 100644 --- a/src/slic3r/GUI/PrePrintChecker.cpp +++ b/src/slic3r/GUI/PrePrintChecker.cpp @@ -1,7 +1,20 @@ #include "PrePrintChecker.hpp" #include "GUI_Utils.hpp" #include "I18N.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PrePrintChecker.hpp b/src/slic3r/GUI/PrePrintChecker.hpp index 5dea00a88f..2ec99e3ed5 100644 --- a/src/slic3r/GUI/PrePrintChecker.hpp +++ b/src/slic3r/GUI/PrePrintChecker.hpp @@ -2,6 +2,11 @@ #define slic3r_GUI_PRE_PRINT_CHECK_hpp_ #include +#include +#include +#include +#include +#include #include #include "Widgets/Label.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index d9aedec79b..61ce51112e 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -1,4 +1,5 @@ #include "Preferences.hpp" +#include "CloudProvider.hpp" #include "OptionsGroup.hpp" #include "GUI_App.hpp" #include "MainFrame.hpp" @@ -10,11 +11,59 @@ #include "libslic3r/AppConfig.hpp" #include "libslic3r/Format/DRC.hpp" #include "libslic3r/CAD/SketchEngine.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Widgets/TabCtrl.hpp" +#include "slic3r/GUI/Field.hpp" +#include +#include "slic3r/GUI/ReleaseNote.hpp" #include #include "OG_CustomCtrl.hpp" +#include "libslic3r_version.h" #include "wx/graphics.h" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "NetworkTestDialog.hpp" #include "Widgets/StaticLine.hpp" #include "Widgets/RadioGroup.hpp" diff --git a/src/slic3r/GUI/Preferences.hpp b/src/slic3r/GUI/Preferences.hpp index e3b6ffdc7d..195a0b45bd 100644 --- a/src/slic3r/GUI/Preferences.hpp +++ b/src/slic3r/GUI/Preferences.hpp @@ -4,12 +4,19 @@ #include "GUI.hpp" #include "GUI_Utils.hpp" +#include +#include +#include #include +#include +#include +#include #include #include #include #include #include +#include #include "Widgets/ComboBox.hpp" #include "Widgets/CheckBox.hpp" #include "Widgets/TextInput.hpp" diff --git a/src/slic3r/GUI/PresetBundleDialog.cpp b/src/slic3r/GUI/PresetBundleDialog.cpp index 8fb4a14ce8..9c11fc67aa 100644 --- a/src/slic3r/GUI/PresetBundleDialog.cpp +++ b/src/slic3r/GUI/PresetBundleDialog.cpp @@ -2,11 +2,27 @@ #include "ExportPresetBundleDialog.hpp" #include "I18N.hpp" #include "GUI_App.hpp" +#include +#include +#include +#include #include +#include "libslic3r/Semver.hpp" +#include "libslic3r/Preset.hpp" #include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #include #include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PresetBundleDialog.hpp b/src/slic3r/GUI/PresetBundleDialog.hpp index c7e7b1bb0e..5e0b4b9b14 100644 --- a/src/slic3r/GUI/PresetBundleDialog.hpp +++ b/src/slic3r/GUI/PresetBundleDialog.hpp @@ -5,17 +5,21 @@ #include "GUI_Utils.hpp" #include "Widgets/WebViewHostDialog.hpp" #include "libslic3r/AppConfig.hpp" +#include #include #include #include #include #include #include +#include #include #include +#include #include #include #include +#include namespace Slic3r { namespace GUI { #define DESIGN_GRAY900_COLOR wxColour("#363636") // Label color diff --git a/src/slic3r/GUI/PresetComboBoxes.cpp b/src/slic3r/GUI/PresetComboBoxes.cpp index c5ffb533e2..28dfbed4a8 100644 --- a/src/slic3r/GUI/PresetComboBoxes.cpp +++ b/src/slic3r/GUI/PresetComboBoxes.cpp @@ -1,6 +1,26 @@ #include "PresetComboBoxes.hpp" +#include +#include +#include +#include +#include +#include +#include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include "slic3r/GUI/Widgets/DropDown.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/EncodedFilament.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/CalibrationWizardPage.hpp" #include #include #include @@ -8,8 +28,16 @@ #include #include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PresetComboBoxes.hpp b/src/slic3r/GUI/PresetComboBoxes.hpp index b63f51dd70..e7de321fc6 100644 --- a/src/slic3r/GUI/PresetComboBoxes.hpp +++ b/src/slic3r/GUI/PresetComboBoxes.hpp @@ -2,7 +2,17 @@ #define slic3r_PresetComboBoxes_hpp_ //#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include #include +#include #include #include diff --git a/src/slic3r/GUI/PresetHints.cpp b/src/slic3r/GUI/PresetHints.cpp index 202253604d..4f33ee8353 100644 --- a/src/slic3r/GUI/PresetHints.cpp +++ b/src/slic3r/GUI/PresetHints.cpp @@ -6,6 +6,10 @@ #include "PresetHints.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include "libslic3r/PresetBundle.hpp" #include #include "GUI.hpp" diff --git a/src/slic3r/GUI/PresetHints.hpp b/src/slic3r/GUI/PresetHints.hpp index 4a71f6ff1a..d7a30890e5 100644 --- a/src/slic3r/GUI/PresetHints.hpp +++ b/src/slic3r/GUI/PresetHints.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_PresetHints_hpp_ #define slic3r_PresetHints_hpp_ +#include "libslic3r/Preset.hpp" #include #include "libslic3r/PresetBundle.hpp" diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index 2b4d212d0f..df14efa976 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -1,20 +1,57 @@ #include "PrintHostDialogs.hpp" #include +#include +#include +#include +#include #include +#include +#include +#include #include +#include "libslic3r/ProjectTask.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/RadioBox.hpp" #include +#include +#include #include +#include #include #include +#include #include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -26,17 +63,20 @@ #include #include +#include "Flashforge.hpp" #include "GUI.hpp" #include "GUI_App.hpp" #include "MsgDialog.hpp" #include "I18N.hpp" #include "MainFrame.hpp" +#include "PrintHost.hpp" #include "libslic3r/AppConfig.hpp" #include "NotificationManager.hpp" #include "ExtraRenderers.hpp" #include "format.hpp" #include "../Utils/CrealityPrint.hpp" #include "BitmapComboBox.hpp" +#include "libslic3r_version.h" #include "wxExtensions.hpp" #include diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp index 6f55c0d953..c348cb0b76 100644 --- a/src/slic3r/GUI/PrintHostDialogs.hpp +++ b/src/slic3r/GUI/PrintHostDialogs.hpp @@ -1,10 +1,14 @@ #ifndef slic3r_PrintHostSendDialog_hpp_ #define slic3r_PrintHostSendDialog_hpp_ +#include +#include #include +#include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp index f03bcb1d29..e43e47c9aa 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.cpp +++ b/src/slic3r/GUI/PrintOptionsDialog.cpp @@ -1,5 +1,31 @@ #include "PrintOptionsDialog.hpp" +#include +#include +#include +#include #include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include "I18N.hpp" #include "GUI_App.hpp" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/PrintOptionsDialog.hpp b/src/slic3r/GUI/PrintOptionsDialog.hpp index 48f9f25b48..803f35c7ff 100644 --- a/src/slic3r/GUI/PrintOptionsDialog.hpp +++ b/src/slic3r/GUI/PrintOptionsDialog.hpp @@ -1,6 +1,12 @@ #ifndef slic3r_GUI_PrintOptionsDialog_hpp_ #define slic3r_GUI_PrintOptionsDialog_hpp_ +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp index 9aa35e2cff..89e57806b8 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.cpp +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.cpp @@ -7,17 +7,52 @@ #include "../../Utils/NetworkAgent.hpp" #include "../BitmapCache.hpp" +#include #include +#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Printer/BambuTunnel.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/Semver.hpp" +#include +#include +#include #include #include "nlohmann/json.hpp" #include +#include #ifndef NDEBUG //#define PRINTER_FILE_SYSTEM_TEST diff --git a/src/slic3r/GUI/Printer/PrinterFileSystem.h b/src/slic3r/GUI/Printer/PrinterFileSystem.h index 03a630e72f..2748e0ae0c 100644 --- a/src/slic3r/GUI/Printer/PrinterFileSystem.h +++ b/src/slic3r/GUI/Printer/PrinterFileSystem.h @@ -1,6 +1,17 @@ #ifndef slic3r_GUI_PrinterFileSystem_h_ #define slic3r_GUI_PrinterFileSystem_h_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define BAMBU_DYNAMIC #include "BambuTunnel.h" diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp index e44a712acc..3b1b15ea6b 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.cpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.cpp @@ -1,8 +1,20 @@ #include "PrinterCloudAuthDialog.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/GUI.hpp" +#include +#include #include #include #include +#include #include #include #include @@ -13,6 +25,7 @@ #include #include "MainFrame.hpp" +#include "PrintHost.hpp" #include #include diff --git a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp index 6ee3779156..5095c76875 100644 --- a/src/slic3r/GUI/PrinterCloudAuthDialog.hpp +++ b/src/slic3r/GUI/PrinterCloudAuthDialog.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_PrinterCloudAuthDialog_hpp_ #define slic3r_GUI_PrinterCloudAuthDialog_hpp_ +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PrinterWebView.cpp b/src/slic3r/GUI/PrinterWebView.cpp index 791bec42b9..4ea2ba0a72 100644 --- a/src/slic3r/GUI/PrinterWebView.cpp +++ b/src/slic3r/GUI/PrinterWebView.cpp @@ -9,11 +9,19 @@ #include "libslic3r_version.h" #include +#include +#include +#include +#include +#include "libslic3r/Utils.hpp" +#include +#include #include #include #include #include +#include #include #ifdef __linux__ diff --git a/src/slic3r/GUI/PrinterWebView.hpp b/src/slic3r/GUI/PrinterWebView.hpp index 1ab1e17932..9bd8ff51a8 100644 --- a/src/slic3r/GUI/PrinterWebView.hpp +++ b/src/slic3r/GUI/PrinterWebView.hpp @@ -6,6 +6,8 @@ #include "wx/cmdline.h" #include "wx/notifmsg.h" #include "wx/settings.h" +#include +#include #include #include diff --git a/src/slic3r/GUI/PrinterWebViewHandler.cpp b/src/slic3r/GUI/PrinterWebViewHandler.cpp index 165d7c16dd..56cf2c3101 100644 --- a/src/slic3r/GUI/PrinterWebViewHandler.cpp +++ b/src/slic3r/GUI/PrinterWebViewHandler.cpp @@ -1,5 +1,6 @@ #include "PrinterWebViewHandler.hpp" +#include "Http.hpp" #include "I18N.hpp" #include "PrinterWebView.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -7,12 +8,20 @@ #include "slic3r/Utils/PrintHost.hpp" #include "libslic3r/Preset.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" #include #include #include +#include #include +#include #include #include +#include +#include using json = nlohmann::json; diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp index c396e85bfe..4e2d4053a8 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp @@ -2,8 +2,25 @@ #include "GUI_App.hpp" #include "GUI.hpp" #include "BitmapCache.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/WebView.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.hpp b/src/slic3r/GUI/PrivacyUpdateDialog.hpp index 6ae32b8397..b1779b36d4 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.hpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.hpp @@ -5,6 +5,11 @@ #include "Widgets/Button.hpp" #include "Widgets/Label.hpp" #include "Widgets/WebView.hpp" +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/ProcessRunner.cpp b/src/slic3r/GUI/ProcessRunner.cpp index 77b296fc25..3be56c032f 100644 --- a/src/slic3r/GUI/ProcessRunner.cpp +++ b/src/slic3r/GUI/ProcessRunner.cpp @@ -1,7 +1,20 @@ #include "ProcessRunner.hpp" +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef _WIN32 #include #endif diff --git a/src/slic3r/GUI/ProcessRunner.hpp b/src/slic3r/GUI/ProcessRunner.hpp index e07ec1af95..95910d4505 100644 --- a/src/slic3r/GUI/ProcessRunner.hpp +++ b/src/slic3r/GUI/ProcessRunner.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_ProcessRunner_hpp_ #define slic3r_GUI_ProcessRunner_hpp_ +#include #include #include diff --git a/src/slic3r/GUI/ProgressStatusBar.cpp b/src/slic3r/GUI/ProgressStatusBar.cpp index 18485659c5..f10a603674 100644 --- a/src/slic3r/GUI/ProgressStatusBar.cpp +++ b/src/slic3r/GUI/ProgressStatusBar.cpp @@ -1,5 +1,9 @@ #include "ProgressStatusBar.hpp" +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp index 127400c8b1..47945e1179 100644 --- a/src/slic3r/GUI/Project.cpp +++ b/src/slic3r/GUI/Project.cpp @@ -4,19 +4,47 @@ #include "libslic3r/Model.hpp" #include "libslic3r/Format/bbs_3mf.hpp" +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Auxiliary.hpp" +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include +#include +#include #include +#include #include +#include +#include +#include +#include #include #include #include #include +#include #include #include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Project.hpp b/src/slic3r/GUI/Project.hpp index a22bc44430..c7a85bce74 100644 --- a/src/slic3r/GUI/Project.hpp +++ b/src/slic3r/GUI/Project.hpp @@ -7,6 +7,14 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#include +#include +#include "slic3r/GUI/StagedBuild.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" #if wxUSE_WEBVIEW_EDGE #include "wx/msw/webview_edge.h" diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.cpp b/src/slic3r/GUI/ProjectDirtyStateManager.cpp index 53eb3cd353..784d6f9b03 100644 --- a/src/slic3r/GUI/ProjectDirtyStateManager.cpp +++ b/src/slic3r/GUI/ProjectDirtyStateManager.cpp @@ -12,6 +12,10 @@ #include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include +#include "libslic3r/Technologies.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ProjectDirtyStateManager.hpp b/src/slic3r/GUI/ProjectDirtyStateManager.hpp index fd121d1d85..efe58440bb 100644 --- a/src/slic3r/GUI/ProjectDirtyStateManager.hpp +++ b/src/slic3r/GUI/ProjectDirtyStateManager.hpp @@ -2,6 +2,11 @@ #define slic3r_ProjectDirtyStateManager_hpp_ #include "libslic3r/Preset.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/PublishDialog.cpp b/src/slic3r/GUI/PublishDialog.cpp index e14c4484cd..f9c0beadb9 100644 --- a/src/slic3r/GUI/PublishDialog.cpp +++ b/src/slic3r/GUI/PublishDialog.cpp @@ -1,6 +1,21 @@ #include "PublishDialog.hpp" #include "GUI_App.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Plater.hpp" #include #include #include diff --git a/src/slic3r/GUI/PublishDialog.hpp b/src/slic3r/GUI/PublishDialog.hpp index 2b59f8e4f0..3accc34784 100644 --- a/src/slic3r/GUI/PublishDialog.hpp +++ b/src/slic3r/GUI/PublishDialog.hpp @@ -4,8 +4,12 @@ #include "I18N.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PublishSettingsDialog.cpp b/src/slic3r/GUI/PublishSettingsDialog.cpp index d231857f2c..8d192cfcf0 100644 --- a/src/slic3r/GUI/PublishSettingsDialog.cpp +++ b/src/slic3r/GUI/PublishSettingsDialog.cpp @@ -22,7 +22,27 @@ #include "libslic3r/Model.hpp" #include +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "libslic3r/CustomGCode.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/TabCtrl.hpp" #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PublishSettingsDialog.hpp b/src/slic3r/GUI/PublishSettingsDialog.hpp index c38d865413..3b7b8a4e5c 100644 --- a/src/slic3r/GUI/PublishSettingsDialog.hpp +++ b/src/slic3r/GUI/PublishSettingsDialog.hpp @@ -6,6 +6,12 @@ #include "libslic3r/PublishSettings.hpp" +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/PurgeModeDialog.cpp b/src/slic3r/GUI/PurgeModeDialog.cpp index b3191a04e5..8bd06d6c65 100644 --- a/src/slic3r/GUI/PurgeModeDialog.cpp +++ b/src/slic3r/GUI/PurgeModeDialog.cpp @@ -1,10 +1,22 @@ #include "PurgeModeDialog.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" #include #include #include #include #include +#include #include "I18N.hpp" #include "GUI_App.hpp" diff --git a/src/slic3r/GUI/PurgeModeDialog.hpp b/src/slic3r/GUI/PurgeModeDialog.hpp index e5880e6ab1..ee802a62f5 100644 --- a/src/slic3r/GUI/PurgeModeDialog.hpp +++ b/src/slic3r/GUI/PurgeModeDialog.hpp @@ -1,7 +1,10 @@ #pragma once +#include #include +#include #include +#include #include "GUI_Utils.hpp" #include "libslic3r/PrintConfig.hpp" diff --git a/src/slic3r/GUI/RammingChart.cpp b/src/slic3r/GUI/RammingChart.cpp index 29116b12cb..6348135d9a 100644 --- a/src/slic3r/GUI/RammingChart.cpp +++ b/src/slic3r/GUI/RammingChart.cpp @@ -1,7 +1,15 @@ // Orca: This file is ported from latest PrusaSlicer #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "RammingChart.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/RammingChart.hpp b/src/slic3r/GUI/RammingChart.hpp index 1517299aed..dbae6341bb 100644 --- a/src/slic3r/GUI/RammingChart.hpp +++ b/src/slic3r/GUI/RammingChart.hpp @@ -3,7 +3,10 @@ #ifndef RAMMING_CHART_H_ #define RAMMING_CHART_H_ +#include #include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/RecenterDialog.cpp b/src/slic3r/GUI/RecenterDialog.cpp index 11f185bf89..34b10ddb23 100644 --- a/src/slic3r/GUI/RecenterDialog.cpp +++ b/src/slic3r/GUI/RecenterDialog.cpp @@ -1,10 +1,20 @@ #include "RecenterDialog.hpp" #include "GUI_App.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" #include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include #include #include #include #include +#include +#include +#include +#include +#include #define BORDER FromDIP(25) #define DRAW_PANEL_SIZE wxSize(FromDIP(475), FromDIP(100)) diff --git a/src/slic3r/GUI/RecenterDialog.hpp b/src/slic3r/GUI/RecenterDialog.hpp index cd7511d3f5..3954d87094 100644 --- a/src/slic3r/GUI/RecenterDialog.hpp +++ b/src/slic3r/GUI/RecenterDialog.hpp @@ -2,9 +2,15 @@ #define slic3r_GUI_RecenterDialog_hpp_ #include "GUI_Utils.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include #include #include "Widgets/Button.hpp" #include +#include +#include namespace Slic3r { namespace GUI { class RecenterDialog : public DPIDialog diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 7853149ccf..a65e39787c 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -1,6 +1,7 @@ #include "ReleaseNote.hpp" #include "I18N.hpp" +#include "bambu_networking.hpp" #include "libslic3r/Utils.hpp" #include "libslic3r/Thread.hpp" #include "GUI.hpp" @@ -16,6 +17,35 @@ #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" #include #include #include @@ -24,6 +54,14 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "BitmapCache.hpp" #include "slic3r/GUI/GUI_App.hpp" diff --git a/src/slic3r/GUI/ReleaseNote.hpp b/src/slic3r/GUI/ReleaseNote.hpp index 5d950005df..1234d59c60 100644 --- a/src/slic3r/GUI/ReleaseNote.hpp +++ b/src/slic3r/GUI/ReleaseNote.hpp @@ -1,6 +1,18 @@ #ifndef slic3r_GUI_ReleaseNote_hpp_ #define slic3r_GUI_ReleaseNote_hpp_ +#include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" #include #include #include diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp b/src/slic3r/GUI/RemovableDriveManager.cpp index 83ec4695c7..8cbe89813a 100644 --- a/src/slic3r/GUI/RemovableDriveManager.cpp +++ b/src/slic3r/GUI/RemovableDriveManager.cpp @@ -1,9 +1,25 @@ #include "RemovableDriveManager.hpp" #include "libslic3r/Platform.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #if _WIN32 #include diff --git a/src/slic3r/GUI/RemovableDriveManager.hpp b/src/slic3r/GUI/RemovableDriveManager.hpp index ea8b4e83a7..72e15b5807 100644 --- a/src/slic3r/GUI/RemovableDriveManager.hpp +++ b/src/slic3r/GUI/RemovableDriveManager.hpp @@ -1,12 +1,14 @@ #ifndef slic3r_GUI_RemovableDriveManager_hpp_ #define slic3r_GUI_RemovableDriveManager_hpp_ +#include #include #include #include #include #include +#include // Custom wxWidget events #include "Event.hpp" diff --git a/src/slic3r/GUI/SafetyOptionsDialog.cpp b/src/slic3r/GUI/SafetyOptionsDialog.cpp index c633d2778e..716b6ac5c4 100644 --- a/src/slic3r/GUI/SafetyOptionsDialog.cpp +++ b/src/slic3r/GUI/SafetyOptionsDialog.cpp @@ -9,6 +9,20 @@ #include "DeviceCore/DevExtruderSystem.h" #include "DeviceCore/DevNozzleSystem.h" #include "DeviceCore/DevPrintOptions.h" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const wxColour STATIC_BOX_LINE_COL = wxColour(238, 238, 238); static const wxColour STATIC_TEXT_CAPTION_COL = wxColour(100, 100, 100); diff --git a/src/slic3r/GUI/SafetyOptionsDialog.hpp b/src/slic3r/GUI/SafetyOptionsDialog.hpp index a39ddb77ab..316501b42b 100644 --- a/src/slic3r/GUI/SafetyOptionsDialog.hpp +++ b/src/slic3r/GUI/SafetyOptionsDialog.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_SafetyOptionsDialog_hpp_ #define slic3r_GUI_SafetyOptionsDialog_hpp_ +#include +#include #include #include #include diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp index 04f98f06f9..7aff669668 100644 --- a/src/slic3r/GUI/SavePresetDialog.cpp +++ b/src/slic3r/GUI/SavePresetDialog.cpp @@ -1,13 +1,35 @@ #include "SavePresetDialog.hpp" +#include +#include #include +#include "libslic3r/Preset.hpp" +#include "slic3r/GUI/Field.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/RadioGroup.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/OptionsGroup.hpp" #include #include #include #include +#include +#include +#include +#include #include #include +#include +#include +#include #include #include "libslic3r/PresetBundle.hpp" diff --git a/src/slic3r/GUI/SavePresetDialog.hpp b/src/slic3r/GUI/SavePresetDialog.hpp index 05aa1b2d39..10cf25883b 100644 --- a/src/slic3r/GUI/SavePresetDialog.hpp +++ b/src/slic3r/GUI/SavePresetDialog.hpp @@ -11,6 +11,11 @@ #include "Widgets/RoundedRectangle.hpp" #include "Widgets/Label.hpp" #include "Widgets/TextInput.hpp" +#include +#include +#include +#include +#include class wxString; class wxStaticText; diff --git a/src/slic3r/GUI/SceneCache.cpp b/src/slic3r/GUI/SceneCache.cpp index a72e32695f..5cca509a5e 100644 --- a/src/slic3r/GUI/SceneCache.cpp +++ b/src/slic3r/GUI/SceneCache.cpp @@ -8,6 +8,8 @@ #include "GUI_App.hpp" #include +#include +#include "libslic3r/Point.hpp" namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SceneRaycaster.cpp b/src/slic3r/GUI/SceneRaycaster.cpp index 408e910ff8..d5abeb4c0f 100644 --- a/src/slic3r/GUI/SceneRaycaster.cpp +++ b/src/slic3r/GUI/SceneRaycaster.cpp @@ -5,6 +5,15 @@ #include "GUI_App.hpp" #include "Selection.hpp" #include "Plater.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/Technologies.hpp" +#include +#include "slic3r/GUI/MeshUtils.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SceneRaycaster.hpp b/src/slic3r/GUI/SceneRaycaster.hpp index 9aa527abee..f6dc5c6261 100644 --- a/src/slic3r/GUI/SceneRaycaster.hpp +++ b/src/slic3r/GUI/SceneRaycaster.hpp @@ -3,6 +3,9 @@ #include "MeshUtils.hpp" #include "GLModel.hpp" +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/Technologies.hpp" #include #include #include diff --git a/src/slic3r/GUI/Search.cpp b/src/slic3r/GUI/Search.cpp index 427271ad2f..dcf0573321 100644 --- a/src/slic3r/GUI/Search.cpp +++ b/src/slic3r/GUI/Search.cpp @@ -1,11 +1,41 @@ #include "Search.hpp" +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/SettingsIndex.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/Widgets/ScrolledWindow.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" #include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "wx/dataview.h" #include "wx/numformatter.h" diff --git a/src/slic3r/GUI/Search.hpp b/src/slic3r/GUI/Search.hpp index 92ccd4d28c..84a1a748dd 100644 --- a/src/slic3r/GUI/Search.hpp +++ b/src/slic3r/GUI/Search.hpp @@ -1,11 +1,22 @@ #ifndef slic3r_SearchComboBox_hpp_ #define slic3r_SearchComboBox_hpp_ +#include +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -15,6 +26,8 @@ #include #include #include +#include +#include #include "wxExtensions.hpp" #include "GUI_Utils.hpp" diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index db4eb723bc..6855a42d77 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -38,6 +38,66 @@ #include "BackgroundSlicingProcess.hpp" // complete type for background_process().get_current_gcode_result() #include "DeviceCore/DevStorage.h" +#include +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "libslic3r/ProjectTask.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/PrePrintChecker.hpp" +#include "slic3r/GUI/DeviceTab/uiAMSBestPositionPopup.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/BBLStatusBarPrint.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include +#include +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "libslic3r/Print.hpp" +#include +#include +#include "slic3r/GUI/Monitor.hpp" +#include +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include "slic3r/GUI/Auxiliary.hpp" +#include +#include "libslic3r/PrintBase.hpp" +#include "slic3r/GUI/PartPlate.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/DropDown.hpp" #include #include #include @@ -45,6 +105,17 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "Notebook.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp index 6a3acce54c..a0515dd20c 100644 --- a/src/slic3r/GUI/SelectMachine.hpp +++ b/src/slic3r/GUI/SelectMachine.hpp @@ -1,6 +1,24 @@ #ifndef slic3r_GUI_SelectMachine_hpp_ #define slic3r_GUI_SelectMachine_hpp_ +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "libslic3r/CommonDefs.hpp" #include #include #include diff --git a/src/slic3r/GUI/SelectMachinePop.cpp b/src/slic3r/GUI/SelectMachinePop.cpp index 0046fd5f7f..6dc39bb1a0 100644 --- a/src/slic3r/GUI/SelectMachinePop.cpp +++ b/src/slic3r/GUI/SelectMachinePop.cpp @@ -17,12 +17,40 @@ #include "ConnectPrinter.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Auxiliary.hpp" +#include "libslic3r/Preset.hpp" +#include +#include #include #include #include #include #include #include +#include +#include +#include +#include +#include #include "Plater.hpp" #include "Notebook.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/SelectMachinePop.hpp b/src/slic3r/GUI/SelectMachinePop.hpp index e34a23708c..37dcd98ac4 100644 --- a/src/slic3r/GUI/SelectMachinePop.hpp +++ b/src/slic3r/GUI/SelectMachinePop.hpp @@ -1,6 +1,15 @@ #ifndef slic3r_GUI_SelectMachinePop_hpp_ #define slic3r_GUI_SelectMachinePop_hpp_ +#include +#include +#include +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" #include #include #include diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 81dd074096..b704ac1fcb 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -14,6 +14,32 @@ #include "libslic3r/LocalesUtils.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/PresetBundle.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/Point.hpp" +#include "libslic3r/Geometry.hpp" +#include "slic3r/GUI/GLModel.hpp" +#include +#include +#include +#include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Geometry.hpp" +#include +#include "libslic3r/Polygon.hpp" +#include "libslic3r/BoundingBox.hpp" +#include "libslic3r/GCode/WipeTower.hpp" +#include "libslic3r/Geometry/Circle.hpp" +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include "libslic3r/Config.hpp" #if ENABLE_ENHANCED_PRINT_VOLUME_FIT #include "libslic3r/BuildVolume.hpp" #endif // ENABLE_ENHANCED_PRINT_VOLUME_FIT diff --git a/src/slic3r/GUI/Selection.hpp b/src/slic3r/GUI/Selection.hpp index 3fae13ec3a..35ba184d08 100644 --- a/src/slic3r/GUI/Selection.hpp +++ b/src/slic3r/GUI/Selection.hpp @@ -5,8 +5,20 @@ #include "GUI_Geometry.hpp" #include "GLModel.hpp" +#include "libslic3r/Technologies.hpp" +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include +#include "libslic3r/libslic3r.h" +#include "libslic3r/Color.hpp" #include #include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/SendMultiMachinePage.cpp b/src/slic3r/GUI/SendMultiMachinePage.cpp index 04becefeac..87b68d1ddd 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.cpp +++ b/src/slic3r/GUI/SendMultiMachinePage.cpp @@ -6,7 +6,58 @@ #include "slic3r/Utils/bambu_networking.hpp" #include "MainFrame.hpp" #include "Widgets/RadioBox.hpp" +#include +#include +#include "slic3r/GUI/MultiMachine.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/MultiTaskManagerPage.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/SelectMachine.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/MultiMachinePage.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/BitmapCache.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include +#include "slic3r/GUI/Auxiliary.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "DeviceCore/DevManager.h" #include "DeviceCore/DevStorage.h" diff --git a/src/slic3r/GUI/SendMultiMachinePage.hpp b/src/slic3r/GUI/SendMultiMachinePage.hpp index eadd78eb0a..7f066b9309 100644 --- a/src/slic3r/GUI/SendMultiMachinePage.hpp +++ b/src/slic3r/GUI/SendMultiMachinePage.hpp @@ -13,6 +13,23 @@ #include "Widgets/TextInput.hpp" #include "AmsMappingPopup.hpp" #include "SelectMachine.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/AppConfig.hpp" +#include +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "libslic3r/GCode/ThumbnailData.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/SendSystemInfoDialog.cpp b/src/slic3r/GUI/SendSystemInfoDialog.cpp index ed22a26753..3c16ddde93 100644 --- a/src/slic3r/GUI/SendSystemInfoDialog.cpp +++ b/src/slic3r/GUI/SendSystemInfoDialog.cpp @@ -1,4 +1,37 @@ #include "SendSystemInfoDialog.hpp" +#include +#include +#include +#include +#include +#include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #if __APPLE__ #import diff --git a/src/slic3r/GUI/SendToPrinter.cpp b/src/slic3r/GUI/SendToPrinter.cpp index d582cfdef7..7a44305e4e 100644 --- a/src/slic3r/GUI/SendToPrinter.cpp +++ b/src/slic3r/GUI/SendToPrinter.cpp @@ -16,16 +16,65 @@ #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" +#include +#include +#include +#include "slic3r/GUI/Auxiliary.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include "slic3r/GUI/MsgDialog.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/SelectMachine.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include "slic3r/GUI/Widgets/AnimaController.hpp" +#include +#include "slic3r/GUI/BBLStatusBarSend.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/PrePrintChecker.hpp" +#include "slic3r/GUI/Jobs/PrintJob.hpp" +#include "slic3r/GUI/Jobs/SendJob.hpp" +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include +#include +#include "slic3r/GUI/PartPlate.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "BitmapCache.hpp" #include "DeviceCore/DevManager.h" #include "DeviceCore/DevConfigUtil.h" #include "DeviceCore/DevStorage.h" +#include "libslic3r_version.h" #include "slic3r/Utils/FileTransferUtils.hpp" diff --git a/src/slic3r/GUI/SendToPrinter.hpp b/src/slic3r/GUI/SendToPrinter.hpp index ddfb017552..fad825713b 100644 --- a/src/slic3r/GUI/SendToPrinter.hpp +++ b/src/slic3r/GUI/SendToPrinter.hpp @@ -1,6 +1,19 @@ #ifndef slic3r_GUI_SendToSDcard_hpp_ #define slic3r_GUI_SendToSDcard_hpp_ +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/PrePrintChecker.hpp" +#include +#include +#include +#include "slic3r/GUI/Jobs/Worker.hpp" +#include +#include +#include "slic3r/GUI/GUI_App.hpp" +#include #include #include #include diff --git a/src/slic3r/GUI/SettingsIndex.cpp b/src/slic3r/GUI/SettingsIndex.cpp index fed344ff71..7300924076 100644 --- a/src/slic3r/GUI/SettingsIndex.cpp +++ b/src/slic3r/GUI/SettingsIndex.cpp @@ -3,10 +3,13 @@ #include #include #include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" #include #include #include +#include #include "GUI.hpp" #include "I18N.hpp" diff --git a/src/slic3r/GUI/SettingsIndex.hpp b/src/slic3r/GUI/SettingsIndex.hpp index a31d2109e0..0815dfec81 100644 --- a/src/slic3r/GUI/SettingsIndex.hpp +++ b/src/slic3r/GUI/SettingsIndex.hpp @@ -3,6 +3,7 @@ #include #include +#include "libslic3r/PrintConfig.hpp" #include #include #include diff --git a/src/slic3r/GUI/Shortcuts.cpp b/src/slic3r/GUI/Shortcuts.cpp index be713b7cf8..8773c6f364 100644 --- a/src/slic3r/GUI/Shortcuts.cpp +++ b/src/slic3r/GUI/Shortcuts.cpp @@ -4,8 +4,16 @@ #include "libslic3r/AppConfig.hpp" #include +#include +#include +#include #include +#include "slic3r/GUI/KeyChord.hpp" +#include +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Shortcuts.hpp b/src/slic3r/GUI/Shortcuts.hpp index 71fe299a98..0e61554e2f 100644 --- a/src/slic3r/GUI/Shortcuts.hpp +++ b/src/slic3r/GUI/Shortcuts.hpp @@ -3,6 +3,7 @@ #include "KeyChord.hpp" #include +#include #include #include #include diff --git a/src/slic3r/GUI/SingleChoiceDialog.cpp b/src/slic3r/GUI/SingleChoiceDialog.cpp index ec8010234b..e6c54cf531 100644 --- a/src/slic3r/GUI/SingleChoiceDialog.cpp +++ b/src/slic3r/GUI/SingleChoiceDialog.cpp @@ -4,6 +4,15 @@ #include "MainFrame.hpp" #include "Widgets/DialogButtons.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SingleChoiceDialog.hpp b/src/slic3r/GUI/SingleChoiceDialog.hpp index ac43ef0808..d77d5d6296 100644 --- a/src/slic3r/GUI/SingleChoiceDialog.hpp +++ b/src/slic3r/GUI/SingleChoiceDialog.hpp @@ -4,6 +4,8 @@ #include "GUI_Utils.hpp" #include "Widgets/Button.hpp" #include "Widgets/ComboBox.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SkipPartCanvas.cpp b/src/slic3r/GUI/SkipPartCanvas.cpp index 7b7db213b1..af714b125d 100644 --- a/src/slic3r/GUI/SkipPartCanvas.cpp +++ b/src/slic3r/GUI/SkipPartCanvas.cpp @@ -1,6 +1,20 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "SkipPartCanvas.hpp" +#include +#include +#include +#include +#include #include #include #include @@ -12,6 +26,14 @@ #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/PartSkipCommon.hpp" +#include +#include +#include wxDEFINE_EVENT(EVT_ZOOM_PERCENT, wxCommandEvent); wxDEFINE_EVENT(EVT_CANVAS_PART, wxCommandEvent); diff --git a/src/slic3r/GUI/SkipPartCanvas.hpp b/src/slic3r/GUI/SkipPartCanvas.hpp index d70ad3718f..c87c391a6e 100644 --- a/src/slic3r/GUI/SkipPartCanvas.hpp +++ b/src/slic3r/GUI/SkipPartCanvas.hpp @@ -1,5 +1,13 @@ #ifndef SKIPPARTCANVAS_H #define SKIPPARTCANVAS_H +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/SliceInfoPanel.cpp b/src/slic3r/GUI/SliceInfoPanel.cpp index a7e436c0ff..ed8ad89147 100644 --- a/src/slic3r/GUI/SliceInfoPanel.cpp +++ b/src/slic3r/GUI/SliceInfoPanel.cpp @@ -1,6 +1,27 @@ #include "SliceInfoPanel.hpp" +#include #include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/ProjectTask.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include #include "I18N.hpp" #include "Widgets/Label.hpp" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/SliceInfoPanel.hpp b/src/slic3r/GUI/SliceInfoPanel.hpp index 09708d68e4..94a6a4149f 100644 --- a/src/slic3r/GUI/SliceInfoPanel.hpp +++ b/src/slic3r/GUI/SliceInfoPanel.hpp @@ -5,9 +5,18 @@ #include "libslic3r/ProjectTask.hpp" #include "DeviceManager.hpp" #include "GUI.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include #include #include +#include +#include +#include +#include #include #include "Widgets/PopupWindow.hpp" diff --git a/src/slic3r/GUI/SlicingProgressNotification.cpp b/src/slic3r/GUI/SlicingProgressNotification.cpp index 539da41024..161e9d0e61 100644 --- a/src/slic3r/GUI/SlicingProgressNotification.cpp +++ b/src/slic3r/GUI/SlicingProgressNotification.cpp @@ -1,4 +1,17 @@ #include "SlicingProgressNotification.hpp" +#include +#include "slic3r/GUI/NotificationManager.hpp" +#include +#include +#include "slic3r/GUI/GLCanvas3D.hpp" +#include +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/ImGuiWrapper.hpp" +#include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include #ifndef IMGUI_DEFINE_MATH_OPERATORS #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/src/slic3r/GUI/SlicingProgressNotification.hpp b/src/slic3r/GUI/SlicingProgressNotification.hpp index 6a7ede1e2e..2564b770ec 100644 --- a/src/slic3r/GUI/SlicingProgressNotification.hpp +++ b/src/slic3r/GUI/SlicingProgressNotification.hpp @@ -3,6 +3,11 @@ #include "DailyTips.hpp" #include "NotificationManager.hpp" +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/SpeedDialDialog.cpp b/src/slic3r/GUI/SpeedDialDialog.cpp index 1d81021a60..45161f472a 100644 --- a/src/slic3r/GUI/SpeedDialDialog.cpp +++ b/src/slic3r/GUI/SpeedDialDialog.cpp @@ -13,12 +13,25 @@ #include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include #include #include #include +#include #include +#include #ifdef __linux__ #include diff --git a/src/slic3r/GUI/SpeedDialDialog.hpp b/src/slic3r/GUI/SpeedDialDialog.hpp index d3b75f2256..f0bc5f3f00 100644 --- a/src/slic3r/GUI/SpeedDialDialog.hpp +++ b/src/slic3r/GUI/SpeedDialDialog.hpp @@ -8,6 +8,7 @@ #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/StagedBuild.hpp b/src/slic3r/GUI/StagedBuild.hpp index 8f4c0454c3..74f07306d8 100644 --- a/src/slic3r/GUI/StagedBuild.hpp +++ b/src/slic3r/GUI/StagedBuild.hpp @@ -1,7 +1,9 @@ #pragma once #include +#include #include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index e4a9d906c0..a1f2b72c1a 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1,5 +1,6 @@ #include "StatusPanel.hpp" #include "I18N.hpp" +#include "IPrinterAgent.hpp" #include "Widgets/Label.hpp" #include "Widgets/Button.hpp" #include "Widgets/StepCtrl.hpp" @@ -11,16 +12,90 @@ #include "MainFrame.hpp" #include "MsgDialog.hpp" +#include "bambu_networking.hpp" #include "slic3r/Utils/Http.hpp" #include "libslic3r/Thread.hpp" #include "DeviceErrorDialog.hpp" #include "RecenterDialog.hpp" #include "CalibUtils.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceManager.hpp" +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include "libslic3r/calib.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/CameraPopup.hpp" +#include +#include "slic3r/GUI/WebMediaController.hpp" +#include "slic3r/GUI/MediaPlayCtrl.h" +#include "slic3r/GUI/Widgets/ImageSwitchButton.hpp" +#include "slic3r/GUI/Widgets/AxisCtrlButton.hpp" +#include "slic3r/GUI/Widgets/AMSControl.hpp" +#include "slic3r/GUI/Widgets/FilamentLoad.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/FanControl.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include +#include "slic3r/GUI/CalibrationWizardPage.hpp" +#include "slic3r/GUI/SelectMachine.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include "slic3r/GUI/Event.hpp" +#include +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "libslic3r/libslic3r.h" #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/SwitchButton.hpp" +#include "slic3r/GUI/wxMediaCtrl3.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Widgets/TempInput.hpp" +#include "slic3r/GUI/Widgets/StaticLine.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/StatusPanel.hpp b/src/slic3r/GUI/StatusPanel.hpp index 0666703475..9f7547ecf1 100644 --- a/src/slic3r/GUI/StatusPanel.hpp +++ b/src/slic3r/GUI/StatusPanel.hpp @@ -8,13 +8,38 @@ #include "CameraPopup.hpp" #include "GUI.hpp" #include "ThermalPreconditioningDialog.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/wxMediaCtrl3.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include "libslic3r/calib.hpp" +#include "slic3r/GUI/Event.hpp" +#include #include #include #include +#include +#include #include #include +#include #include #include +#include #include "MediaPlayCtrl.h" #include "WebMediaController.hpp" #include "AMSSetting.hpp" diff --git a/src/slic3r/GUI/StepMeshDialog.cpp b/src/slic3r/GUI/StepMeshDialog.cpp index c6131b7bfa..6316d10292 100644 --- a/src/slic3r/GUI/StepMeshDialog.cpp +++ b/src/slic3r/GUI/StepMeshDialog.cpp @@ -1,7 +1,18 @@ #include "StepMeshDialog.hpp" +#include "libslic3r/Format/STEP.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include "libslic3r/LocalesUtils.hpp" +#include "libslic3r/Thread.hpp" #include +#include +#include #include +#include #include #include #include @@ -13,6 +24,9 @@ #include "Widgets/DialogButtons.hpp" #include "Widgets/RoundedRectangle.hpp" #include +#include +#include +#include using namespace Slic3r; using namespace Slic3r::GUI; diff --git a/src/slic3r/GUI/StepMeshDialog.hpp b/src/slic3r/GUI/StepMeshDialog.hpp index af7f150157..34673d1561 100644 --- a/src/slic3r/GUI/StepMeshDialog.hpp +++ b/src/slic3r/GUI/StepMeshDialog.hpp @@ -2,6 +2,7 @@ #define _STEP_MESH_DIALOG_H_ #include +#include #include "GUI_App.hpp" #include "GUI_Utils.hpp" #include "libslic3r/Format/STEP.hpp" diff --git a/src/slic3r/GUI/SurfaceDrag.cpp b/src/slic3r/GUI/SurfaceDrag.cpp index 025b1d71c6..81b03c4836 100644 --- a/src/slic3r/GUI/SurfaceDrag.cpp +++ b/src/slic3r/GUI/SurfaceDrag.cpp @@ -1,7 +1,21 @@ #include "SurfaceDrag.hpp" +#include +#include +#include "libslic3r/BoundingBox.hpp" +#include +#include +#include "libslic3r/Geometry.hpp" +#include +#include +#include #include // ModelVolume #include +#include "libslic3r/Point.hpp" +#include +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Selection.hpp" +#include "slic3r/GUI/3DScene.hpp" #include "slic3r/Utils/RaycastManager.hpp" diff --git a/src/slic3r/GUI/SurfaceDrag.hpp b/src/slic3r/GUI/SurfaceDrag.hpp index f6bd731ae9..9de39a403e 100644 --- a/src/slic3r/GUI/SurfaceDrag.hpp +++ b/src/slic3r/GUI/SurfaceDrag.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_SurfaceDrag_hpp_ #define slic3r_SurfaceDrag_hpp_ +#include "libslic3r/Model.hpp" #include #include "libslic3r/Point.hpp" // Vec2d, Transform3d #include "slic3r/Utils/RaycastManager.hpp" diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index b481a1b71b..f4c46c4a5c 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -1,7 +1,48 @@ #include "SyncAmsInfoDialog.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/Preset.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/SelectMachine.hpp" +#include "libslic3r/ProjectTask.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "slic3r/GUI/BBLStatusBarPrint.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "libslic3r/PrintConfig.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "libslic3r/GCode/GCodeProcessor.hpp" +#include "libslic3r/CommonDefs.hpp" +#include "slic3r/GUI/ReleaseNote.hpp" +#include "libslic3r/Thread.hpp" +#include +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" +#include "libslic3r/Color.hpp" +#include "slic3r/GUI/3DScene.hpp" +#include "slic3r/GUI/BaseTransparentDPIFrame.hpp" #include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include #include @@ -16,6 +57,11 @@ #include "Jobs/BoostThreadWorker.hpp" #include "Jobs/PlaterWorker.hpp" #include +#include +#include +#include +#include +#include #include "Widgets/Label.hpp" #include "Widgets/Button.hpp" #include "Widgets/CheckBox.hpp" diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.hpp b/src/slic3r/GUI/SyncAmsInfoDialog.hpp index 6f86af6032..96afb7d714 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.hpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.hpp @@ -2,11 +2,37 @@ #define _SyncAmsInfo_DIALOG_H_ #include +#include +#include "slic3r/GUI/PrePrintChecker.hpp" +#include +#include +#include "libslic3r/ProjectTask.hpp" +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Format/bbs_3mf.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/wxExtensions.hpp" +#include "libslic3r/GCode/ThumbnailData.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include "libslic3r/CommonDefs.hpp" +#include "libslic3r/PresetBundle.hpp" #include #include "GUI_App.hpp" #include "GUI_Utils.hpp" +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "SelectMachine.hpp" #include "DeviceManager.hpp" #include "BaseTransparentDPIFrame.hpp" diff --git a/src/slic3r/GUI/SysInfoDialog.hpp b/src/slic3r/GUI/SysInfoDialog.hpp index 070db61b2d..25a59f0fa7 100644 --- a/src/slic3r/GUI/SysInfoDialog.hpp +++ b/src/slic3r/GUI/SysInfoDialog.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_GUI_SysInfoDialog_hpp_ #define slic3r_GUI_SysInfoDialog_hpp_ +#include #include #include diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index b7f3e614b5..c60566d5c7 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -13,13 +13,60 @@ #include "Search.hpp" #include "OG_CustomCtrl.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Field.hpp" +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Preset.hpp" +#include +#include +#include +#include +#include +#include "libslic3r/ParameterUtils.hpp" +#include +#include "slic3r/GUI/ObjectDataViewModel.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "libslic3r/enum_bitmask.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include +#include +#include "libslic3r/LifecycleEvents.hpp" +#include "libslic3r/Point.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Tab.hpp b/src/slic3r/GUI/Tab.hpp index 98428b148e..0ace0d7b9f 100644 --- a/src/slic3r/GUI/Tab.hpp +++ b/src/slic3r/GUI/Tab.hpp @@ -15,6 +15,16 @@ // Slic3r::GUI::Tab::Preset; // - Single preset item: name, file is default or external. +#include "libslic3r/PrintConfig.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/Field.hpp" +#include +#include +#include +#include +#include #include #include #include @@ -22,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/src/slic3r/GUI/TabButton.cpp b/src/slic3r/GUI/TabButton.cpp index 79b9f32d13..3469c9c980 100644 --- a/src/slic3r/GUI/TabButton.cpp +++ b/src/slic3r/GUI/TabButton.cpp @@ -1,8 +1,18 @@ #include "TabButton.hpp" #include "Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include #include #include +#include +#include +#include BEGIN_EVENT_TABLE(TabButton, StaticBox) diff --git a/src/slic3r/GUI/TabButton.hpp b/src/slic3r/GUI/TabButton.hpp index 05ce1c6bd3..e637ea836b 100644 --- a/src/slic3r/GUI/TabButton.hpp +++ b/src/slic3r/GUI/TabButton.hpp @@ -3,6 +3,11 @@ #include "wxExtensions.hpp" #include "Widgets/StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include class TabButton : public StaticBox { diff --git a/src/slic3r/GUI/Tabbook.cpp b/src/slic3r/GUI/Tabbook.cpp index 40ced79d13..bfc5cf00f6 100644 --- a/src/slic3r/GUI/Tabbook.cpp +++ b/src/slic3r/GUI/Tabbook.cpp @@ -9,8 +9,17 @@ //BBS set font size #include "Widgets/Label.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include wxDEFINE_EVENT(wxCUSTOMEVT_TABBOOK_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Tabbook.hpp b/src/slic3r/GUI/Tabbook.hpp index b1301a5c23..fd18ff0589 100644 --- a/src/slic3r/GUI/Tabbook.hpp +++ b/src/slic3r/GUI/Tabbook.hpp @@ -3,8 +3,19 @@ //#ifdef _WIN32 +#include +#include +#include #include +#include +#include +#include +#include +#include #include +#include +#include +#include #include "wxExtensions.hpp" diff --git a/src/slic3r/GUI/TaskManager.cpp b/src/slic3r/GUI/TaskManager.cpp index 64f3e5d6a5..bbb49b4c76 100644 --- a/src/slic3r/GUI/TaskManager.cpp +++ b/src/slic3r/GUI/TaskManager.cpp @@ -1,12 +1,25 @@ #include "TaskManager.hpp" +#include "bambu_networking.hpp" #include "libslic3r/Thread.hpp" #include "libslic3r/LifecycleEvents.hpp" #include "nlohmann/json.hpp" #include "MainFrame.hpp" #include "GUI_App.hpp" +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" using namespace nlohmann; diff --git a/src/slic3r/GUI/TaskManager.hpp b/src/slic3r/GUI/TaskManager.hpp index 5c42d352d6..0f9686294d 100644 --- a/src/slic3r/GUI/TaskManager.hpp +++ b/src/slic3r/GUI/TaskManager.hpp @@ -2,10 +2,21 @@ #define slic3r_TaskManager_hpp_ #include "DeviceManager.hpp" +#include "bambu_networking.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/TerminalDialog.cpp b/src/slic3r/GUI/TerminalDialog.cpp index 71f4bff28c..ce4435aa07 100644 --- a/src/slic3r/GUI/TerminalDialog.cpp +++ b/src/slic3r/GUI/TerminalDialog.cpp @@ -4,9 +4,18 @@ #include "slic3r/plugin/PythonInterpreter.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include +#include +#include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/TerminalDialog.hpp b/src/slic3r/GUI/TerminalDialog.hpp index 7d44d167c7..6abd268c36 100644 --- a/src/slic3r/GUI/TerminalDialog.hpp +++ b/src/slic3r/GUI/TerminalDialog.hpp @@ -6,6 +6,11 @@ #include #include #include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/TextLines.cpp b/src/slic3r/GUI/TextLines.cpp index 63f247dfc7..1efd36a0ed 100644 --- a/src/slic3r/GUI/TextLines.cpp +++ b/src/slic3r/GUI/TextLines.cpp @@ -1,7 +1,25 @@ #include "TextLines.hpp" +#include +#include +#include +#include +#include #include +#include +#include "libslic3r/Point.hpp" +#include +#include +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/libslic3r.h" +#include "libslic3r/Line.hpp" +#include "libslic3r/ExPolygon.hpp" +#include "libslic3r/AABBTreeIndirect.hpp" +#include "libslic3r/Polygon.hpp" +#include "libslic3r/Color.hpp" +#include "libslic3r/TextConfiguration.hpp" +#include "EmbossStyleManager.hpp" #include "libslic3r/Model.hpp" #include "libslic3r/Emboss.hpp" diff --git a/src/slic3r/GUI/TextLines.hpp b/src/slic3r/GUI/TextLines.hpp index f6e297cc22..4664de98c6 100644 --- a/src/slic3r/GUI/TextLines.hpp +++ b/src/slic3r/GUI/TextLines.hpp @@ -1,6 +1,7 @@ #ifndef slic3r_TextLines_hpp_ #define slic3r_TextLines_hpp_ +#include "libslic3r/TextConfiguration.hpp" #include #include #include diff --git a/src/slic3r/GUI/TextureImportDialog.cpp b/src/slic3r/GUI/TextureImportDialog.cpp index 7296a1ebeb..9ce10595ba 100644 --- a/src/slic3r/GUI/TextureImportDialog.cpp +++ b/src/slic3r/GUI/TextureImportDialog.cpp @@ -1,3 +1,6 @@ +#include +#include +#include #include #include "OpenGLManager.hpp" @@ -13,16 +16,46 @@ #include "libslic3r/MeshBoolean.hpp" #include "libslic3r/TriangleSelector.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "libslic3r/TexturePainting.hpp" +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include "libslic3r/TriangleMesh.hpp" +#include +#include #include #include #include +#include +#include #include #include +#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include #include #include @@ -36,6 +69,7 @@ #include #include +#include static constexpr const char* DEFAULT_VIRTUAL_FILAMENT_BASIC_TYPE = "PLA Basic"; static constexpr const char* DEFAULT_VIRTUAL_FILAMENT_SHORT_TYPE = "PLA"; diff --git a/src/slic3r/GUI/TextureImportDialog.hpp b/src/slic3r/GUI/TextureImportDialog.hpp index 960bac6145..b1a2449fca 100644 --- a/src/slic3r/GUI/TextureImportDialog.hpp +++ b/src/slic3r/GUI/TextureImportDialog.hpp @@ -4,11 +4,14 @@ #include "Widgets/ProgressDialog.hpp" #include "libslic3r/TexturePainting.hpp" +#include +#include #include #include #include "Widgets/PopupWindow.hpp" #include #include +#include #include #include "Widgets/SpinInput.hpp" #include diff --git a/src/slic3r/GUI/TextureLibrary.cpp b/src/slic3r/GUI/TextureLibrary.cpp index 7cbd50a240..e3f73258df 100644 --- a/src/slic3r/GUI/TextureLibrary.cpp +++ b/src/slic3r/GUI/TextureLibrary.cpp @@ -1,8 +1,17 @@ #include "TextureLibrary.hpp" #include +#include +#include +#include +#include #include +#include +#include #include +#include +#include +#include #include #include @@ -11,6 +20,9 @@ #include #include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/TextureProjectorFrame.cpp b/src/slic3r/GUI/TextureProjectorFrame.cpp index cfa29967ad..9469e0f397 100644 --- a/src/slic3r/GUI/TextureProjectorFrame.cpp +++ b/src/slic3r/GUI/TextureProjectorFrame.cpp @@ -2,8 +2,16 @@ #include +#include +#include #include +#include +#include +#include #include +#include +#include +#include #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" diff --git a/src/slic3r/GUI/TextureProjectorFrame.hpp b/src/slic3r/GUI/TextureProjectorFrame.hpp index 784062680d..6c2048465b 100644 --- a/src/slic3r/GUI/TextureProjectorFrame.hpp +++ b/src/slic3r/GUI/TextureProjectorFrame.hpp @@ -21,7 +21,9 @@ #include #include +#include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp index bd04335a22..03a0c5f45f 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.cpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.cpp @@ -5,6 +5,17 @@ #include "wxExtensions.hpp" #include "DeviceManager.hpp" #include "DeviceCore/DevManager.h" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp index 57cda90b18..a7538a7e9a 100644 --- a/src/slic3r/GUI/ThermalPreconditioningDialog.hpp +++ b/src/slic3r/GUI/ThermalPreconditioningDialog.hpp @@ -1,5 +1,9 @@ #pragma once +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/TickCode.cpp b/src/slic3r/GUI/TickCode.cpp index 267752c544..92997095b6 100644 --- a/src/slic3r/GUI/TickCode.cpp +++ b/src/slic3r/GUI/TickCode.cpp @@ -1,4 +1,9 @@ #include "TickCode.hpp" +#include +#include "libslic3r/CustomGCode.hpp" +#include "libslic3r/Color.hpp" +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/TickCode.hpp b/src/slic3r/GUI/TickCode.hpp index 14785dee55..50025d4172 100644 --- a/src/slic3r/GUI/TickCode.hpp +++ b/src/slic3r/GUI/TickCode.hpp @@ -4,6 +4,8 @@ #include "libslic3r/CustomGCode.hpp" #include "libslic3r/Color.hpp" #include +#include +#include namespace Slic3r { using namespace CustomGCode; diff --git a/src/slic3r/GUI/TroubleshootDialog.cpp b/src/slic3r/GUI/TroubleshootDialog.cpp index 7cbb00b5d8..8cb87f10c3 100644 --- a/src/slic3r/GUI/TroubleshootDialog.cpp +++ b/src/slic3r/GUI/TroubleshootDialog.cpp @@ -6,10 +6,54 @@ #include "GUI_App.hpp" #include "MainFrame.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/OpenGLManager.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include #include #include +#include +#include +#include #include +#include "libslic3r_version.h" #include "wx/clipbrd.h" #include "libslic3r/libslic3r.h" @@ -19,6 +63,9 @@ #include "libslic3r/Preset.hpp" #include +#include +#include +#include #ifdef __WINDOWS__ #include diff --git a/src/slic3r/GUI/TroubleshootDialog.hpp b/src/slic3r/GUI/TroubleshootDialog.hpp index ab0fcfbadd..f8b1e5fbaa 100644 --- a/src/slic3r/GUI/TroubleshootDialog.hpp +++ b/src/slic3r/GUI/TroubleshootDialog.hpp @@ -1,6 +1,17 @@ #ifndef slic3r_GUI_TroublesootDialog_hpp_ #define slic3r_GUI_TroublesootDialog_hpp_ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/UVEditorCanvas.cpp b/src/slic3r/GUI/UVEditorCanvas.cpp index dd0432bc95..3a2b28a689 100644 --- a/src/slic3r/GUI/UVEditorCanvas.cpp +++ b/src/slic3r/GUI/UVEditorCanvas.cpp @@ -1,14 +1,38 @@ #include "UVEditorCanvas.hpp" +#include #include #include +#include +#include +#include "libslic3r/Point.hpp" +#include #include +#include +#include +#include "slic3r/GUI/GLModel.hpp" #include #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include #include "3DScene.hpp" #include "BitmapCache.hpp" diff --git a/src/slic3r/GUI/UVEditorCanvas.hpp b/src/slic3r/GUI/UVEditorCanvas.hpp index 0dd088c4e8..2b3ee0781d 100644 --- a/src/slic3r/GUI/UVEditorCanvas.hpp +++ b/src/slic3r/GUI/UVEditorCanvas.hpp @@ -1,8 +1,11 @@ #ifndef slic3r_UVEditorCanvas_hpp_ #define slic3r_UVEditorCanvas_hpp_ +#include #include +#include #include +#include "libslic3r/Color.hpp" #include #include @@ -10,9 +13,12 @@ // pulls in the platform's real GL/gl.h, and glad/gl.h errors out if that happens first (it wants // to be the one to define the standard include guards GL/gl.h itself defines). #include +#include +#include #include #include #include +#include #include #include #include diff --git a/src/slic3r/GUI/UnsavedChangesDialog.cpp b/src/slic3r/GUI/UnsavedChangesDialog.cpp index df809396f5..9619debd59 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.cpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.cpp @@ -1,13 +1,52 @@ #include "UnsavedChangesDialog.hpp" +#include +#include +#include +#include +#include +#include #include +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Preset.hpp" +#include "libslic3r/Config.hpp" +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/Gizmos/GLGizmoBase.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/SettingsIndex.hpp" +#include +#include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include "CalibUtils.hpp" #include "libslic3r/PrintConfig.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Color.hpp" diff --git a/src/slic3r/GUI/UnsavedChangesDialog.hpp b/src/slic3r/GUI/UnsavedChangesDialog.hpp index 3145434e8c..0cbb927ebc 100644 --- a/src/slic3r/GUI/UnsavedChangesDialog.hpp +++ b/src/slic3r/GUI/UnsavedChangesDialog.hpp @@ -1,9 +1,24 @@ #ifndef slic3r_UnsavedChangesDialog_hpp_ #define slic3r_UnsavedChangesDialog_hpp_ +#include "slic3r/GUI/Event.hpp" +#include +#include "libslic3r/Preset.hpp" +#include +#include +#include "libslic3r/Config.hpp" +#include "libslic3r/PrintConfig.hpp" +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include #include "GUI_Utils.hpp" #include "wxExtensions.hpp" diff --git a/src/slic3r/GUI/UpdateDialogs.cpp b/src/slic3r/GUI/UpdateDialogs.cpp index 42383cd177..83a8738aa3 100644 --- a/src/slic3r/GUI/UpdateDialogs.cpp +++ b/src/slic3r/GUI/UpdateDialogs.cpp @@ -4,6 +4,18 @@ #include #include +#include +#include "libslic3r/Semver.hpp" +#include "slic3r/GUI/MsgDialog.hpp" +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include #include #include #include @@ -11,6 +23,7 @@ #include #include #include +#include #include "libslic3r/libslic3r.h" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/UpdateDialogs.hpp b/src/slic3r/GUI/UpdateDialogs.hpp index 784c10f09a..a18b34c293 100644 --- a/src/slic3r/GUI/UpdateDialogs.hpp +++ b/src/slic3r/GUI/UpdateDialogs.hpp @@ -1,10 +1,14 @@ #ifndef slic3r_UpdateDialogs_hpp_ #define slic3r_UpdateDialogs_hpp_ +#include "slic3r/GUI/GUI_Utils.hpp" #include #include +#include #include +#include #include +#include #include "libslic3r/Semver.hpp" #include "MsgDialog.hpp" diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp index 5f168025ed..485ac48b99 100644 --- a/src/slic3r/GUI/UpgradePanel.cpp +++ b/src/slic3r/GUI/UpgradePanel.cpp @@ -1,7 +1,27 @@ #include "UpgradePanel.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/ProgressBar.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include "slic3r/GUI/ReleaseNote.hpp" #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include "slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h" #include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRackUpdate.h" diff --git a/src/slic3r/GUI/UpgradePanel.hpp b/src/slic3r/GUI/UpgradePanel.hpp index ba7e86e807..2e0245e40e 100644 --- a/src/slic3r/GUI/UpgradePanel.hpp +++ b/src/slic3r/GUI/UpgradePanel.hpp @@ -1,12 +1,23 @@ #ifndef slic3r_UpgradePanel_hpp_ #define slic3r_UpgradePanel_hpp_ +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevFirmware.h" +#include "slic3r/GUI/DeviceCore/DevDefs.h" #include #include #include "Widgets/ProgressBar.hpp" #include #include #include +#include +#include +#include #include "ReleaseNote.hpp" namespace Slic3r { diff --git a/src/slic3r/GUI/UserManager.cpp b/src/slic3r/GUI/UserManager.cpp index f181f3e568..3cbf30cfd9 100644 --- a/src/slic3r/GUI/UserManager.cpp +++ b/src/slic3r/GUI/UserManager.cpp @@ -1,3 +1,4 @@ +#include "json_diff.hpp" #include "libslic3r/libslic3r.h" #include "UserManager.hpp" #include "DeviceManager.hpp" @@ -9,6 +10,8 @@ #include "MsgDialog.hpp" #include "DeviceCore/DevManager.h" +#include +#include namespace Slic3r { diff --git a/src/slic3r/GUI/WebDialog.cpp b/src/slic3r/GUI/WebDialog.cpp index 8bcb517d87..509ccefdee 100644 --- a/src/slic3r/GUI/WebDialog.cpp +++ b/src/slic3r/GUI/WebDialog.cpp @@ -3,9 +3,15 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Widgets/WebHosting.hpp" +#include +#include "slic3r/GUI/Widgets/WebViewHostDialog.hpp" +#include #include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebDialog.hpp b/src/slic3r/GUI/WebDialog.hpp index aec5de18ef..2fb017d68c 100644 --- a/src/slic3r/GUI/WebDialog.hpp +++ b/src/slic3r/GUI/WebDialog.hpp @@ -8,6 +8,10 @@ #include #include +#include +#include +#include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebDownPluginDlg.cpp b/src/slic3r/GUI/WebDownPluginDlg.cpp index 6358582831..93c8c77d46 100644 --- a/src/slic3r/GUI/WebDownPluginDlg.cpp +++ b/src/slic3r/GUI/WebDownPluginDlg.cpp @@ -1,6 +1,11 @@ #include "WebDownPluginDlg.hpp" #include "ConfigWizard.hpp" +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include #include #include "I18N.hpp" #include "libslic3r/AppConfig.hpp" @@ -8,10 +13,17 @@ #include "slic3r/GUI/GUI_App.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include #include +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/WebDownPluginDlg.hpp b/src/slic3r/GUI/WebDownPluginDlg.hpp index c05de098e5..71b2876a5b 100644 --- a/src/slic3r/GUI/WebDownPluginDlg.hpp +++ b/src/slic3r/GUI/WebDownPluginDlg.hpp @@ -6,6 +6,9 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#include +#include +#include #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index c77c8a5698..4f1998ae94 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -1,12 +1,34 @@ #include "WebGuideDialog.hpp" #include "ConfigWizard.hpp" +#include #include +#include +#include +#include +#include #include #include #include #include #include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include "slic3r/GUI/GUI.hpp" +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include "slic3r/GUI/Event.hpp" +#include "slic3r/GUI/Plater.hpp" +#include +#include +#include +#include "slic3r/GUI/UnsavedChangesDialog.hpp" +#include "slic3r/GUI/ParamsDialog.hpp" +#include "libslic3r/Semver.hpp" +#include +#include +#include #include #include "I18N.hpp" #include "libslic3r/AppConfig.hpp" @@ -18,10 +40,24 @@ #include "slic3r/GUI/GUI_App.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/WebGuideDialog.hpp b/src/slic3r/GUI/WebGuideDialog.hpp index 9cd95d2515..73aa765c89 100644 --- a/src/slic3r/GUI/WebGuideDialog.hpp +++ b/src/slic3r/GUI/WebGuideDialog.hpp @@ -6,6 +6,14 @@ #include "wx/notifmsg.h" #include "wx/settings.h" #include "wx/webview.h" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include +#include +#include +#include +#include #if wxUSE_WEBVIEW_IE #include "wx/msw/webview_ie.h" diff --git a/src/slic3r/GUI/WebMediaController.cpp b/src/slic3r/GUI/WebMediaController.cpp index fe4b94d3ac..f9c2e17fe8 100644 --- a/src/slic3r/GUI/WebMediaController.cpp +++ b/src/slic3r/GUI/WebMediaController.cpp @@ -1,5 +1,8 @@ #include "WebMediaController.hpp" +#include "IPrinterAgent.hpp" +#include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebMediaController.hpp b/src/slic3r/GUI/WebMediaController.hpp index e7756d8977..2d3e4e7cbf 100644 --- a/src/slic3r/GUI/WebMediaController.hpp +++ b/src/slic3r/GUI/WebMediaController.hpp @@ -4,6 +4,7 @@ #include #include +#include class wxWebView; diff --git a/src/slic3r/GUI/WebPanel.cpp b/src/slic3r/GUI/WebPanel.cpp index a8cef9d941..5222636471 100644 --- a/src/slic3r/GUI/WebPanel.cpp +++ b/src/slic3r/GUI/WebPanel.cpp @@ -7,7 +7,13 @@ #include +#include +#include +#include +#include #include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WebPanel.hpp b/src/slic3r/GUI/WebPanel.hpp index d4c493dbc1..4ef5fec34c 100644 --- a/src/slic3r/GUI/WebPanel.hpp +++ b/src/slic3r/GUI/WebPanel.hpp @@ -2,6 +2,7 @@ #include +#include #include #include diff --git a/src/slic3r/GUI/WebRtcMediaController.cpp b/src/slic3r/GUI/WebRtcMediaController.cpp index 9c03c7c8b1..9028bf384c 100644 --- a/src/slic3r/GUI/WebRtcMediaController.cpp +++ b/src/slic3r/GUI/WebRtcMediaController.cpp @@ -1,9 +1,26 @@ #include "WebRtcMediaController.hpp" +#include "ICameraSignalingChannel.hpp" +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/WebRtcMediaController.hpp b/src/slic3r/GUI/WebRtcMediaController.hpp index 7a2ab02abb..0c291ef0e2 100644 --- a/src/slic3r/GUI/WebRtcMediaController.hpp +++ b/src/slic3r/GUI/WebRtcMediaController.hpp @@ -3,6 +3,9 @@ #include "IMediaController.hpp" #include +#include +#include +#include #include #include @@ -16,6 +19,8 @@ #include #include #include +#include +#include namespace rtc { class DataChannel; diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 72860e3bdc..bf7c7d9365 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -1,17 +1,41 @@ #include "WebUserLoginDialog.hpp" +#include +#include +#include "slic3r/GUI/HttpServer.hpp" +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/GUI.hpp" +#include +#include +#include "libslic3r/Utils.hpp" #include +#include "CloudProvider.hpp" #include "I18N.hpp" +#include "ICloudServiceAgent.hpp" #include "libslic3r/AppConfig.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/Utils/NetworkAgent.hpp" #include "libslic3r_version.h" +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include #include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/WebUserLoginDialog.hpp b/src/slic3r/GUI/WebUserLoginDialog.hpp index ce16a79718..f462052239 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.hpp +++ b/src/slic3r/GUI/WebUserLoginDialog.hpp @@ -1,4 +1,9 @@ #pragma once +#include +#include +#include +#include +#include #ifndef slic3r_ZWebUserLogin_HEAD_ #define slic3r_ZWebUserLogin_HEAD_ diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index a98b196eb1..02fc7b0877 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -1,5 +1,6 @@ #include "WebViewDialog.hpp" +#include "CloudProvider.hpp" #include "I18N.hpp" #include "slic3r/GUI/wxExtensions.hpp" #include "slic3r/GUI/GUI_App.hpp" @@ -7,15 +8,40 @@ #include "libslic3r_version.h" #include "../Utils/Http.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include "slic3r/GUI/GUI.hpp" +#include "libslic3r/Utils.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include +#include +#include #include +#include +#include +#include #include #include +#include #include #include +#include +#include +#include namespace pt = boost::property_tree; diff --git a/src/slic3r/GUI/WebViewDialog.hpp b/src/slic3r/GUI/WebViewDialog.hpp index 73ad061bb0..96d18f23c0 100644 --- a/src/slic3r/GUI/WebViewDialog.hpp +++ b/src/slic3r/GUI/WebViewDialog.hpp @@ -6,6 +6,13 @@ #include "wx/cmdline.h" #include "wx/notifmsg.h" #include "wx/settings.h" +#include +#include +#include +#include +#include +#include +#include #include #if wxUSE_WEBVIEW_EDGE diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 7ba24fd991..8a5f03b7ad 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -11,11 +11,36 @@ #include "slic3r/GUI/DeviceCore/DevFilaSystem.h" #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include +#include +#include "slic3r/GUI/AmsMappingPopup.hpp" +#include "slic3r/GUI/AMSDryControl.hpp" +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include #include #include #include #include +#include #include "CalibUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 39421f1275..4f44d7a1e7 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -9,11 +9,24 @@ #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" #include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include #include #include #include #include +#include +#include #include "slic3r/GUI/DeviceCore/DevExtruderSystem.h" #include "slic3r/GUI/AMSDryControl.hpp" diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index 9d5ec9c1c1..96ca92494d 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -12,10 +12,36 @@ #include "slic3r/GUI/DeviceCore/DevConfig.h" #include "slic3r/GUI/DeviceCore/DevManager.h" +#include +#include +#include "slic3r/GUI/Event.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include "slic3r/GUI/DeviceManager.hpp" +#include +#include "libslic3r/libslic3r.h" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include #include #include #include +#include +#include #include "CalibUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/AMSItem.hpp b/src/slic3r/GUI/Widgets/AMSItem.hpp index ac4283b7e8..e84ba64d98 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.hpp +++ b/src/slic3r/GUI/Widgets/AMSItem.hpp @@ -8,11 +8,27 @@ #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" #include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include +#include #include "slic3r/GUI/DeviceCore/DevFilaSwitch.h" // Orca: DevFilaSwitch::SwitchPos for inlet-aware AMS placement diff --git a/src/slic3r/GUI/Widgets/AnimaController.cpp b/src/slic3r/GUI/Widgets/AnimaController.cpp index d5f665cde1..a73c6d8e50 100644 --- a/src/slic3r/GUI/Widgets/AnimaController.cpp +++ b/src/slic3r/GUI/Widgets/AnimaController.cpp @@ -1,7 +1,16 @@ #include "AnimaController.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include #include +#include +#include +#include +#include +#include #ifdef __APPLE__ #include "libslic3r/MacUtils.hpp" #endif diff --git a/src/slic3r/GUI/Widgets/AnimaController.hpp b/src/slic3r/GUI/Widgets/AnimaController.hpp index daf8f95314..e32eae6fb7 100644 --- a/src/slic3r/GUI/Widgets/AnimaController.hpp +++ b/src/slic3r/GUI/Widgets/AnimaController.hpp @@ -3,6 +3,11 @@ #include "../wxExtensions.hpp" #include "Label.hpp" +#include +#include +#include +#include +#include class AnimaIcon : public wxPanel diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp index 535abfcaf2..a771e28be2 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.cpp @@ -2,8 +2,20 @@ #include "Label.hpp" #include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include StateColor blank_bg(StateColor(std::make_pair(wxColour("#FFFFFF"), (int)StateColor::Normal))); static const wxColour BUTTON_BG_COL = wxColour("#EEEEEE"); diff --git a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp index 739861bf0d..3a9b714c5c 100644 --- a/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp +++ b/src/slic3r/GUI/Widgets/AxisCtrlButton.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_AxisCtrlButton_hpp_ #define slic3r_GUI_AxisCtrlButton_hpp_ +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp index d29daef1de..7010dbd91c 100644 --- a/src/slic3r/GUI/Widgets/Button.cpp +++ b/src/slic3r/GUI/Widgets/Button.cpp @@ -1,7 +1,19 @@ #include "Button.hpp" #include "Label.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include +#include #include +#include +#include +#include #include #ifdef __APPLE__ #include "libslic3r/MacUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/Button.hpp b/src/slic3r/GUI/Widgets/Button.hpp index 4077bd5cac..cee2eb15b6 100644 --- a/src/slic3r/GUI/Widgets/Button.hpp +++ b/src/slic3r/GUI/Widgets/Button.hpp @@ -3,6 +3,12 @@ #include "../wxExtensions.hpp" #include "StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/CheckBox.cpp b/src/slic3r/GUI/Widgets/CheckBox.cpp index 91cbb8c4e1..f019f18784 100644 --- a/src/slic3r/GUI/Widgets/CheckBox.cpp +++ b/src/slic3r/GUI/Widgets/CheckBox.cpp @@ -1,6 +1,9 @@ #include "CheckBox.hpp" #include "../wxExtensions.hpp" +#include +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/CheckBox.hpp b/src/slic3r/GUI/Widgets/CheckBox.hpp index abff45ecf1..3ad3dac2c4 100644 --- a/src/slic3r/GUI/Widgets/CheckBox.hpp +++ b/src/slic3r/GUI/Widgets/CheckBox.hpp @@ -3,6 +3,7 @@ #include "../wxExtensions.hpp" +#include #include class CheckBox : public wxBitmapToggleButton diff --git a/src/slic3r/GUI/Widgets/CheckList.cpp b/src/slic3r/GUI/Widgets/CheckList.cpp index ed404c62fe..2b8dcac75e 100644 --- a/src/slic3r/GUI/Widgets/CheckList.cpp +++ b/src/slic3r/GUI/Widgets/CheckList.cpp @@ -2,6 +2,19 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include CheckList::CheckList( wxWindow* parent, diff --git a/src/slic3r/GUI/Widgets/CheckList.hpp b/src/slic3r/GUI/Widgets/CheckList.hpp index bd40e1ad84..9e5ae4c9e1 100644 --- a/src/slic3r/GUI/Widgets/CheckList.hpp +++ b/src/slic3r/GUI/Widgets/CheckList.hpp @@ -6,6 +6,13 @@ #include "Label.hpp" #include "TextInput.hpp" +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp index 08687f3cf6..7d507789f5 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.cpp +++ b/src/slic3r/GUI/Widgets/ComboBox.cpp @@ -1,7 +1,18 @@ #include "ComboBox.hpp" #include "Label.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include +#include "slic3r/GUI/Widgets/DropDown.hpp" +#include +#include +#include +#include #include +#include +#include +#include +#include BEGIN_EVENT_TABLE(ComboBox, TextInput) diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp index 91c34d53aa..f13bc876c4 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.hpp +++ b/src/slic3r/GUI/Widgets/ComboBox.hpp @@ -3,6 +3,15 @@ #include "TextInput.hpp" #include "DropDown.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define CB_NO_DROP_ICON DD_NO_CHECK_ICON #define CB_NO_TEXT DD_NO_TEXT diff --git a/src/slic3r/GUI/Widgets/DialogButtons.cpp b/src/slic3r/GUI/Widgets/DialogButtons.cpp index 05e3bcbbc1..f43f1953cf 100644 --- a/src/slic3r/GUI/Widgets/DialogButtons.cpp +++ b/src/slic3r/GUI/Widgets/DialogButtons.cpp @@ -1,6 +1,17 @@ #include "DialogButtons.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/DialogButtons.hpp b/src/slic3r/GUI/Widgets/DialogButtons.hpp index d03a1dfd47..3186e7f09c 100644 --- a/src/slic3r/GUI/Widgets/DialogButtons.hpp +++ b/src/slic3r/GUI/Widgets/DialogButtons.hpp @@ -10,6 +10,10 @@ #include "Label.hpp" #include "slic3r/GUI/GUI_App.hpp" +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp index cd4d5edff8..c17e5d6e04 100644 --- a/src/slic3r/GUI/Widgets/DropDown.cpp +++ b/src/slic3r/GUI/Widgets/DropDown.cpp @@ -1,10 +1,24 @@ #include "DropDown.hpp" #include "Label.hpp" +#include +#include +#include #include +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include +#include +#include #include #include #include +#include +#include +#include +#include +#include #ifdef __WXGTK__ #include diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp index bcd0a58c41..f9e759202a 100644 --- a/src/slic3r/GUI/Widgets/DropDown.hpp +++ b/src/slic3r/GUI/Widgets/DropDown.hpp @@ -2,7 +2,15 @@ #define slic3r_GUI_DropDown_hpp_ #include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include +#include #include "../wxExtensions.hpp" #include "StateHandler.hpp" #include "PopupWindow.hpp" diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp index dc6c2fc9ed..bb024073e0 100644 --- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.cpp @@ -1,5 +1,8 @@ #include "ErrorMsgStaticText.hpp" #include +#include +#include +#include ErrorMsgStaticText::ErrorMsgStaticText() {} diff --git a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp index 63968a57c5..71adbcd7cf 100644 --- a/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp +++ b/src/slic3r/GUI/Widgets/ErrorMsgStaticText.hpp @@ -2,7 +2,11 @@ #ifndef _WX_ERRORMSGSTATTEXT_H_ #define _WX_ERRORMSGSTATTEXT_H_ +#include +#include +#include #include +#include #include "wx/stattext.h" class WXDLLIMPEXP_CORE ErrorMsgStaticText : public wxPanel diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp index 7efdfabf07..3ffaf59141 100644 --- a/src/slic3r/GUI/Widgets/FanControl.cpp +++ b/src/slic3r/GUI/Widgets/FanControl.cpp @@ -4,9 +4,29 @@ #include "../I18N.hpp" #include "../GUI_App.hpp" #include "../MsgDialog.hpp" +#include "json_diff.hpp" +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/DeviceCore/DevFan.h" +#include +#include +#include +#include +#include "slic3r/GUI/SelectMachine.hpp" +#include "slic3r/GUI/DeviceCore/DevConfigUtil.h" +#include #include #include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/FanControl.hpp b/src/slic3r/GUI/Widgets/FanControl.hpp index 2badbf8594..b97c9a4d27 100644 --- a/src/slic3r/GUI/Widgets/FanControl.hpp +++ b/src/slic3r/GUI/Widgets/FanControl.hpp @@ -9,10 +9,23 @@ #include "../SelectMachine.hpp" #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include +#include #include #include #include #include +#include +#include #include "../DeviceCore/DevFan.h" namespace Slic3r { diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.cpp b/src/slic3r/GUI/Widgets/FilamentLoad.cpp index 2f2ef4dd92..712c103826 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.cpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.cpp @@ -5,10 +5,18 @@ #include "../GUI_App.hpp" #include "../DeviceCore/DevFilaSystem.h" +#include +#include +#include "slic3r/GUI/Widgets/StepCtrl.hpp" +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include #include #include #include +#include #include "CalibUtils.hpp" diff --git a/src/slic3r/GUI/Widgets/FilamentLoad.hpp b/src/slic3r/GUI/Widgets/FilamentLoad.hpp index e3cc6daf67..257e92d21c 100644 --- a/src/slic3r/GUI/Widgets/FilamentLoad.hpp +++ b/src/slic3r/GUI/Widgets/FilamentLoad.hpp @@ -8,10 +8,17 @@ #include "../DeviceManager.hpp" #include "slic3r/GUI/Event.hpp" #include "slic3r/GUI/AmsMappingPopup.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/AMSItem.hpp" +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include #include #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/HyperLink.cpp b/src/slic3r/GUI/Widgets/HyperLink.cpp index 7fdb236199..cc065e1c9b 100644 --- a/src/slic3r/GUI/Widgets/HyperLink.cpp +++ b/src/slic3r/GUI/Widgets/HyperLink.cpp @@ -1,5 +1,11 @@ #include "HyperLink.hpp" #include "Label.hpp" +#include +#include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/HyperLink.hpp b/src/slic3r/GUI/Widgets/HyperLink.hpp index 48e2245e3b..09b033802e 100644 --- a/src/slic3r/GUI/Widgets/HyperLink.hpp +++ b/src/slic3r/GUI/Widgets/HyperLink.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_HyperLink_hpp_ #define slic3r_GUI_HyperLink_hpp_ +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp index adaadcb8f5..9915795af5 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.cpp @@ -4,8 +4,15 @@ #include "../wxExtensions.hpp" #include "slic3r/GUI/I18N.hpp" +#include +#include +#include +#include #include #include +#include +#include +#include BEGIN_EVENT_TABLE(ImageSwitchButton, StaticBox) diff --git a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp index d49bc6642c..69d643a3df 100644 --- a/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/ImageSwitchButton.hpp @@ -7,6 +7,11 @@ #include "Button.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include #include class ImageSwitchButton : public StaticBox diff --git a/src/slic3r/GUI/Widgets/Label.cpp b/src/slic3r/GUI/Widgets/Label.cpp index 60a2a90a9e..da5e9b72af 100644 --- a/src/slic3r/GUI/Widgets/Label.cpp +++ b/src/slic3r/GUI/Widgets/Label.cpp @@ -1,10 +1,25 @@ #include "libslic3r/Utils.hpp" #include "Label.hpp" #include "StaticBox.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include // For wxLocale #include +#include #include #include +#include +#include #ifdef __linux__ #include #endif diff --git a/src/slic3r/GUI/Widgets/Label.hpp b/src/slic3r/GUI/Widgets/Label.hpp index 1415db6ad7..29df6a8272 100644 --- a/src/slic3r/GUI/Widgets/Label.hpp +++ b/src/slic3r/GUI/Widgets/Label.hpp @@ -1,7 +1,11 @@ #ifndef slic3r_GUI_Label_hpp_ #define slic3r_GUI_Label_hpp_ +#include +#include +#include #include +#include #define LB_HYPERLINK 0x0020 #define LB_PROPAGATE_MOUSE_EVENT 0x0040 diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp index a11839a8b8..734373ca7b 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.cpp @@ -3,6 +3,15 @@ #include "../GUI.hpp" #include "../GUI_Utils.hpp" #include "Label.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include +#include LabeledStaticBox::LabeledStaticBox() : state_handler(this) diff --git a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp index d3e7f2efce..d47699aa73 100644 --- a/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp +++ b/src/slic3r/GUI/Widgets/LabeledStaticBox.hpp @@ -1,6 +1,9 @@ #ifndef slic3r_GUI_LabeledStaticBox_hpp_ #define slic3r_GUI_LabeledStaticBox_hpp_ +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" #include #include #include diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp index 616b8b8779..bbaf2cb3b3 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp @@ -12,18 +12,46 @@ #include "Label.hpp" #include "ComboBox.hpp" #include "StaticBox.hpp" +#include "json_diff.hpp" #include "libslic3r/PresetBundle.hpp" #include "libslic3r/Utils.hpp" #include +#include #include +#include "libslic3r/PrintConfig.hpp" +#include "libslic3r/Config.hpp" +#include +#include +#include "libslic3r/MultiNozzleUtils.hpp" #include +#include #include +#include #include +#include "slic3r/GUI/GUI_Utils.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include "slic3r/GUI/DeviceCore/DevDefs.h" +#include +#include +#include +#include "slic3r/GUI/DeviceCore/DevNozzleRack.h" #include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp index 50bd534c72..85dd5f1977 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.hpp @@ -23,7 +23,11 @@ #include "slic3r/GUI/DeviceCore/DevNozzleRack.h" #include "slic3r/GUI/DeviceTab/wgtDeviceNozzleRack.h" +#include +#include #include +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/PopupWindow.cpp b/src/slic3r/GUI/Widgets/PopupWindow.cpp index 8fb1cda774..371ece392b 100644 --- a/src/slic3r/GUI/Widgets/PopupWindow.cpp +++ b/src/slic3r/GUI/Widgets/PopupWindow.cpp @@ -1,4 +1,6 @@ #include "PopupWindow.hpp" +#include +#include static wxWindow *GetTopParent(wxWindow *pWindow) { diff --git a/src/slic3r/GUI/Widgets/ProgressBar.cpp b/src/slic3r/GUI/Widgets/ProgressBar.cpp index 1bd9882cd3..86963fa638 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.cpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.cpp @@ -1,7 +1,11 @@ #include "ProgressBar.hpp" #include "../I18N.hpp" +#include #include #include +#include +#include +#include #include "Label.hpp" diff --git a/src/slic3r/GUI/Widgets/ProgressBar.hpp b/src/slic3r/GUI/Widgets/ProgressBar.hpp index 40ddb8e4be..728f47d65a 100644 --- a/src/slic3r/GUI/Widgets/ProgressBar.hpp +++ b/src/slic3r/GUI/Widgets/ProgressBar.hpp @@ -1,6 +1,10 @@ #ifndef slic3r_GUI_ProgressBar_hpp_ #define slic3r_GUI_ProgressBar_hpp_ +#include +#include +#include +#include #include #include "../wxExtensions.hpp" diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.cpp b/src/slic3r/GUI/Widgets/ProgressDialog.cpp index 6d42df1007..82d2efa0eb 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.cpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.cpp @@ -1,4 +1,14 @@ #include "wx/wxprec.h" +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include +#include #ifndef WX_PRECOMP #include "wx/utils.h" diff --git a/src/slic3r/GUI/Widgets/ProgressDialog.hpp b/src/slic3r/GUI/Widgets/ProgressDialog.hpp index 9ebf31b194..a8b2dee827 100644 --- a/src/slic3r/GUI/Widgets/ProgressDialog.hpp +++ b/src/slic3r/GUI/Widgets/ProgressDialog.hpp @@ -7,6 +7,12 @@ #include "wx/simplebook.h" #include "Button.hpp" #include "../wxExtensions.hpp" +#include +#include +#include +#include +#include +#include class WXDLLIMPEXP_FWD_CORE wxButton; class WXDLLIMPEXP_FWD_CORE wxEventLoop; diff --git a/src/slic3r/GUI/Widgets/RadioBox.cpp b/src/slic3r/GUI/Widgets/RadioBox.cpp index f00447e0ec..93e8f63b91 100644 --- a/src/slic3r/GUI/Widgets/RadioBox.cpp +++ b/src/slic3r/GUI/Widgets/RadioBox.cpp @@ -1,6 +1,8 @@ #include "RadioBox.hpp" #include "../wxExtensions.hpp" +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/RadioGroup.cpp b/src/slic3r/GUI/Widgets/RadioGroup.cpp index a5f63a9ac0..5b4499a1b4 100644 --- a/src/slic3r/GUI/Widgets/RadioGroup.cpp +++ b/src/slic3r/GUI/Widgets/RadioGroup.cpp @@ -1,6 +1,20 @@ #include "RadioGroup.hpp" #include "Label.hpp" #include "StateColor.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" RadioGroup::RadioGroup( wxWindow* parent, diff --git a/src/slic3r/GUI/Widgets/RadioGroup.hpp b/src/slic3r/GUI/Widgets/RadioGroup.hpp index 93dc1df73f..6f25190431 100644 --- a/src/slic3r/GUI/Widgets/RadioGroup.hpp +++ b/src/slic3r/GUI/Widgets/RadioGroup.hpp @@ -3,6 +3,10 @@ #include "../wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" #include #include #include diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp index 681251a764..5b5cd98076 100644 --- a/src/slic3r/GUI/Widgets/RoundedRectangle.cpp +++ b/src/slic3r/GUI/Widgets/RoundedRectangle.cpp @@ -1,7 +1,11 @@ #include "RoundedRectangle.hpp" #include "../wxExtensions.hpp" +#include +#include #include #include +#include +#include BEGIN_EVENT_TABLE(RoundedRectangle, wxWindow) EVT_PAINT(RoundedRectangle::OnPaint) diff --git a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp index 970901031f..e28611ef55 100644 --- a/src/slic3r/GUI/Widgets/RoundedRectangle.hpp +++ b/src/slic3r/GUI/Widgets/RoundedRectangle.hpp @@ -2,6 +2,9 @@ #define slic3r_GUI_ROUNDEDRECTANGLE_hpp_ #include "../wxExtensions.hpp" +#include +#include +#include class RoundedRectangle : public wxWindow { diff --git a/src/slic3r/GUI/Widgets/Scrollbar.cpp b/src/slic3r/GUI/Widgets/Scrollbar.cpp index 5b2140c658..0c076e939a 100644 --- a/src/slic3r/GUI/Widgets/Scrollbar.cpp +++ b/src/slic3r/GUI/Widgets/Scrollbar.cpp @@ -1,3 +1,8 @@ +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/Scrollbar.hpp b/src/slic3r/GUI/Widgets/Scrollbar.hpp index 9b00eaedca..0a69601291 100644 --- a/src/slic3r/GUI/Widgets/Scrollbar.hpp +++ b/src/slic3r/GUI/Widgets/Scrollbar.hpp @@ -1,4 +1,8 @@ #pragma once +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp index 90922f93f1..025ade8eda 100644 --- a/src/slic3r/GUI/Widgets/ScrolledWindow.cpp +++ b/src/slic3r/GUI/Widgets/ScrolledWindow.cpp @@ -1,4 +1,10 @@ // for scroll +#include +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp index 5c2bc2f9e5..a430dec423 100644 --- a/src/slic3r/GUI/Widgets/ScrolledWindow.hpp +++ b/src/slic3r/GUI/Widgets/ScrolledWindow.hpp @@ -1,4 +1,9 @@ #pragma once +#include +#include +#include +#include +#include #include #ifndef WX_PRECOMP #include diff --git a/src/slic3r/GUI/Widgets/SideButton.cpp b/src/slic3r/GUI/Widgets/SideButton.cpp index 08c58309e5..e9fe493621 100644 --- a/src/slic3r/GUI/Widgets/SideButton.cpp +++ b/src/slic3r/GUI/Widgets/SideButton.cpp @@ -1,8 +1,15 @@ #include "SideButton.hpp" #include "Label.hpp" +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include #include #include +#include +#include +#include +#include BEGIN_EVENT_TABLE(SideButton, wxWindow) EVT_LEFT_DOWN(SideButton::mouseDown) diff --git a/src/slic3r/GUI/Widgets/SideButton.hpp b/src/slic3r/GUI/Widgets/SideButton.hpp index 894a7d8727..84a210c3e3 100644 --- a/src/slic3r/GUI/Widgets/SideButton.hpp +++ b/src/slic3r/GUI/Widgets/SideButton.hpp @@ -1,7 +1,14 @@ #ifndef slic3r_GUI_SideButton_hpp_ #define slic3r_GUI_SideButton_hpp_ +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include +#include #include #include #include "../wxExtensions.hpp" diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp index caa6c8f802..3a55475e60 100644 --- a/src/slic3r/GUI/Widgets/SideMenuPopup.cpp +++ b/src/slic3r/GUI/Widgets/SideMenuPopup.cpp @@ -1,8 +1,16 @@ #include "SideMenuPopup.hpp" #include "Label.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include #include "../GUI_App.hpp" diff --git a/src/slic3r/GUI/Widgets/SideMenuPopup.hpp b/src/slic3r/GUI/Widgets/SideMenuPopup.hpp index 09f756a5eb..dc665e3557 100644 --- a/src/slic3r/GUI/Widgets/SideMenuPopup.hpp +++ b/src/slic3r/GUI/Widgets/SideMenuPopup.hpp @@ -1,6 +1,9 @@ #ifndef slic3r_GUI_SideMenuPopup_hpp_ #define slic3r_GUI_SideMenuPopup_hpp_ +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/SideTools.cpp b/src/slic3r/GUI/Widgets/SideTools.cpp index d66c46c42b..79be4c3b87 100644 --- a/src/slic3r/GUI/Widgets/SideTools.cpp +++ b/src/slic3r/GUI/Widgets/SideTools.cpp @@ -1,7 +1,22 @@ #include "SideTools.hpp" #include "bambu_networking.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/Button.hpp" +#include "slic3r/GUI/Widgets/HyperLink.hpp" +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include "Label.hpp" #include "StateColor.hpp" #include "../GUI_App.hpp" diff --git a/src/slic3r/GUI/Widgets/SideTools.hpp b/src/slic3r/GUI/Widgets/SideTools.hpp index 24cbae4fd2..81c42ecef0 100644 --- a/src/slic3r/GUI/Widgets/SideTools.hpp +++ b/src/slic3r/GUI/Widgets/SideTools.hpp @@ -1,9 +1,14 @@ #ifndef slic3r_GUI_SIDETOOLS_hpp_ #define slic3r_GUI_SIDETOOLS_hpp_ +#include +#include #include +#include #include #include +#include +#include #include "Button.hpp" #include "Label.hpp" #include "HyperLink.hpp" // ORCA diff --git a/src/slic3r/GUI/Widgets/SpinInput.cpp b/src/slic3r/GUI/Widgets/SpinInput.cpp index c91fd41543..3077304947 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.cpp +++ b/src/slic3r/GUI/Widgets/SpinInput.cpp @@ -3,7 +3,19 @@ #include "Button.hpp" #include "TextCtrl.h" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/SpinInput.hpp b/src/slic3r/GUI/Widgets/SpinInput.hpp index caf2bf3843..27bf6fcddf 100644 --- a/src/slic3r/GUI/Widgets/SpinInput.hpp +++ b/src/slic3r/GUI/Widgets/SpinInput.hpp @@ -1,7 +1,13 @@ #ifndef slic3r_GUI_SpinInput_hpp_ #define slic3r_GUI_SpinInput_hpp_ +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include #include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/StateColor.cpp b/src/slic3r/GUI/Widgets/StateColor.cpp index 2a9d91f59a..8d9cded8a6 100644 --- a/src/slic3r/GUI/Widgets/StateColor.cpp +++ b/src/slic3r/GUI/Widgets/StateColor.cpp @@ -1,5 +1,10 @@ #include "StateColor.hpp" +#include #include +#include +#include +#include +#include static bool gDarkMode = false; diff --git a/src/slic3r/GUI/Widgets/StateColor.hpp b/src/slic3r/GUI/Widgets/StateColor.hpp index 8aa8cb4dfe..669108adf3 100644 --- a/src/slic3r/GUI/Widgets/StateColor.hpp +++ b/src/slic3r/GUI/Widgets/StateColor.hpp @@ -1,9 +1,13 @@ #ifndef slic3r_GUI_StateColor_hpp_ #define slic3r_GUI_StateColor_hpp_ +#include +#include +#include #include #include +#include class StateColor { diff --git a/src/slic3r/GUI/Widgets/StateHandler.cpp b/src/slic3r/GUI/Widgets/StateHandler.cpp index f71f649144..7329965572 100644 --- a/src/slic3r/GUI/Widgets/StateHandler.cpp +++ b/src/slic3r/GUI/Widgets/StateHandler.cpp @@ -1,4 +1,8 @@ #include "StateHandler.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include #include wxDEFINE_EVENT(EVT_ENABLE_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/StateHandler.hpp b/src/slic3r/GUI/Widgets/StateHandler.hpp index a0af2cc285..c0bba3a36a 100644 --- a/src/slic3r/GUI/Widgets/StateHandler.hpp +++ b/src/slic3r/GUI/Widgets/StateHandler.hpp @@ -2,6 +2,7 @@ #define slic3r_GUI_StateHandler_hpp_ #include +#include #include #include "StateColor.hpp" diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp index 75953ceb3f..87a1d26827 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.cpp +++ b/src/slic3r/GUI/Widgets/StaticBox.cpp @@ -1,7 +1,15 @@ #include "StaticBox.hpp" #include "../GUI.hpp" +#include +#include +#include +#include +#include #include #include +#include +#include +#include BEGIN_EVENT_TABLE(StaticBox, wxWindow) diff --git a/src/slic3r/GUI/Widgets/StaticBox.hpp b/src/slic3r/GUI/Widgets/StaticBox.hpp index b1aee505ce..b7662ff670 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.hpp +++ b/src/slic3r/GUI/Widgets/StaticBox.hpp @@ -4,6 +4,12 @@ #include "../wxExtensions.hpp" #include "StateHandler.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include #include class StaticBox : public wxWindow diff --git a/src/slic3r/GUI/Widgets/StaticLine.cpp b/src/slic3r/GUI/Widgets/StaticLine.cpp index 3dd564c02b..f574a5b739 100644 --- a/src/slic3r/GUI/Widgets/StaticLine.cpp +++ b/src/slic3r/GUI/Widgets/StaticLine.cpp @@ -2,8 +2,14 @@ #include "Label.hpp" #include "StateColor.hpp" +#include +#include #include #include +#include +#include +#include +#include BEGIN_EVENT_TABLE(StaticLine, wxWindow) diff --git a/src/slic3r/GUI/Widgets/StaticLine.hpp b/src/slic3r/GUI/Widgets/StaticLine.hpp index 46944b9d26..2241dfbd21 100644 --- a/src/slic3r/GUI/Widgets/StaticLine.hpp +++ b/src/slic3r/GUI/Widgets/StaticLine.hpp @@ -3,6 +3,9 @@ #include "../wxExtensions.hpp" #include "wx/window.h" +#include +#include +#include class StaticLine : public wxWindow { diff --git a/src/slic3r/GUI/Widgets/StepCtrl.cpp b/src/slic3r/GUI/Widgets/StepCtrl.cpp index c780351755..34ce8506de 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.cpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.cpp @@ -1,8 +1,16 @@ #include "StepCtrl.hpp" #include "Label.hpp" +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" #include +#include +#include #include +#include wxDEFINE_EVENT( EVT_STEP_CHANGING, wxCommandEvent ); wxDEFINE_EVENT( EVT_STEP_CHANGED, wxCommandEvent ); diff --git a/src/slic3r/GUI/Widgets/StepCtrl.hpp b/src/slic3r/GUI/Widgets/StepCtrl.hpp index f59f9aac85..d568443eaa 100644 --- a/src/slic3r/GUI/Widgets/StepCtrl.hpp +++ b/src/slic3r/GUI/Widgets/StepCtrl.hpp @@ -2,6 +2,14 @@ #define slic3r_GUI_StepCtrlBase_hpp_ #include "StaticBox.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include wxDECLARE_EVENT( EVT_STEP_CHANGING, wxCommandEvent ); wxDECLARE_EVENT( EVT_STEP_CHANGED, wxCommandEvent ); diff --git a/src/slic3r/GUI/Widgets/SwitchButton.cpp b/src/slic3r/GUI/Widgets/SwitchButton.cpp index f9fa3405d3..6ac9d2210f 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.cpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.cpp @@ -5,7 +5,23 @@ #include "../wxExtensions.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include #include +#include +#include +#include +#include #include "../GUI_App.hpp" #include "slic3r/GUI/I18N.hpp" #include "../Utils/MacDarkMode.hpp" diff --git a/src/slic3r/GUI/Widgets/SwitchButton.hpp b/src/slic3r/GUI/Widgets/SwitchButton.hpp index decff25919..e4ef0005ad 100644 --- a/src/slic3r/GUI/Widgets/SwitchButton.hpp +++ b/src/slic3r/GUI/Widgets/SwitchButton.hpp @@ -5,9 +5,16 @@ #include "StateColor.hpp" #include "StaticBox.hpp" +#include #include +#include +#include +#include +#include +#include #include #include +#include #include #include "Button.hpp" diff --git a/src/slic3r/GUI/Widgets/TabCtrl.cpp b/src/slic3r/GUI/Widgets/TabCtrl.cpp index ef23e2c5e4..66ff926d25 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.cpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.cpp @@ -1,6 +1,16 @@ #include "TabCtrl.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include +#include #include +#include +#include +#include +#include wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent); wxDEFINE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/TabCtrl.hpp b/src/slic3r/GUI/Widgets/TabCtrl.hpp index d89da145af..80ac49da0a 100644 --- a/src/slic3r/GUI/Widgets/TabCtrl.hpp +++ b/src/slic3r/GUI/Widgets/TabCtrl.hpp @@ -2,6 +2,15 @@ #define slic3r_GUI_TabCtrl_hpp_ #include "Button.hpp" +#include +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGING, wxCommandEvent); wxDECLARE_EVENT(wxEVT_TAB_SEL_CHANGED, wxCommandEvent); diff --git a/src/slic3r/GUI/Widgets/TempInput.cpp b/src/slic3r/GUI/Widgets/TempInput.cpp index 79899940d1..99f50269ed 100644 --- a/src/slic3r/GUI/Widgets/TempInput.cpp +++ b/src/slic3r/GUI/Widgets/TempInput.cpp @@ -2,7 +2,21 @@ #include "Label.hpp" #include "PopupWindow.hpp" #include "../I18N.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include #include +#include +#include +#include +#include +#include +#include +#include #include "../GUI.hpp" #include "../GUI_App.hpp" diff --git a/src/slic3r/GUI/Widgets/TempInput.hpp b/src/slic3r/GUI/Widgets/TempInput.hpp index f281a1ea6e..8560576b96 100644 --- a/src/slic3r/GUI/Widgets/TempInput.hpp +++ b/src/slic3r/GUI/Widgets/TempInput.hpp @@ -2,6 +2,15 @@ #define slic3r_GUI_TempInput_hpp_ #include "../wxExtensions.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include +#include +#include #include #include #include "StaticBox.hpp" diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp index 23f55d155c..0ed38ff8de 100644 --- a/src/slic3r/GUI/Widgets/TextInput.cpp +++ b/src/slic3r/GUI/Widgets/TextInput.cpp @@ -3,8 +3,18 @@ #include "TextCtrl.h" #include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/StaticBox.hpp" +#include +#include +#include "slic3r/GUI/Widgets/StateHandler.hpp" +#include +#include #include #include +#include +#include +#include +#include #ifdef __WXGTK__ #include "../GUI_Utils.hpp" diff --git a/src/slic3r/GUI/Widgets/TextInput.hpp b/src/slic3r/GUI/Widgets/TextInput.hpp index bbd38b0c00..0e7d722961 100644 --- a/src/slic3r/GUI/Widgets/TextInput.hpp +++ b/src/slic3r/GUI/Widgets/TextInput.hpp @@ -1,6 +1,13 @@ #ifndef slic3r_GUI_TextInput_hpp_ #define slic3r_GUI_TextInput_hpp_ +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include +#include #include #include "StaticBox.hpp" diff --git a/src/slic3r/GUI/Widgets/WebHosting.cpp b/src/slic3r/GUI/Widgets/WebHosting.cpp index b6af6d3a39..e3fa9423aa 100644 --- a/src/slic3r/GUI/Widgets/WebHosting.cpp +++ b/src/slic3r/GUI/Widgets/WebHosting.cpp @@ -6,6 +6,7 @@ #include +#include #include namespace Slic3r { namespace GUI { namespace web_hosting { diff --git a/src/slic3r/GUI/Widgets/WebView.cpp b/src/slic3r/GUI/Widgets/WebView.cpp index a313e80d66..9a4d5f90b0 100644 --- a/src/slic3r/GUI/Widgets/WebView.cpp +++ b/src/slic3r/GUI/Widgets/WebView.cpp @@ -3,11 +3,26 @@ #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/Utils/MacDarkMode.hpp" +#include #include +#include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/slic3r/GUI/Widgets/WebView.hpp b/src/slic3r/GUI/Widgets/WebView.hpp index 69aa88ca4d..2dc126643d 100644 --- a/src/slic3r/GUI/Widgets/WebView.hpp +++ b/src/slic3r/GUI/Widgets/WebView.hpp @@ -1,6 +1,8 @@ #ifndef slic3r_GUI_WebView_hpp_ #define slic3r_GUI_WebView_hpp_ +#include +#include #include #include diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp index 3c14ab37e1..d16d7022d4 100644 --- a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp +++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp @@ -4,15 +4,24 @@ #include "slic3r/GUI/GUI.hpp" #include "slic3r/GUI/GUI_App.hpp" #include "slic3r/GUI/Widgets/StateColor.hpp" +#include "libslic3r/Utils.hpp" +#include #include #include #include +#include +#include +#include +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include #include #include #include +#include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp index 57ee21d119..1f617f6757 100644 --- a/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp +++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.hpp @@ -7,7 +7,11 @@ #include #include +#include +#include +#include #include +#include #include namespace Slic3r { namespace GUI { diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 126f090a0b..51fcb8f613 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -1,6 +1,31 @@ #include +#include +#include +#include +#include +#include +#include "slic3r/GUI/RammingChart.hpp" +#include +#include "slic3r/GUI/Widgets/StateColor.hpp" +#include +#include "slic3r/GUI/Widgets/SpinInput.hpp" +#include +#include "libslic3r/PrintConfig.hpp" +#include "slic3r/GUI/Printer/PrinterFileSystem.h" +#include "slic3r/GUI/Plater.hpp" +#include "libslic3r/FlushVolPredictor.hpp" +#include "libslic3r/Utils.hpp" +#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include #include "libslic3r/FlushVolCalc.hpp" #include "WipeTowerDialog.hpp" #include "GUI.hpp" diff --git a/src/slic3r/GUI/calib_dlg.cpp b/src/slic3r/GUI/calib_dlg.cpp index 4d8a835f73..48ea425cf0 100644 --- a/src/slic3r/GUI/calib_dlg.cpp +++ b/src/slic3r/GUI/calib_dlg.cpp @@ -2,6 +2,25 @@ #include "GUI_App.hpp" #include "MsgDialog.hpp" #include "I18N.hpp" +#include +#include +#include +#include "slic3r/GUI/Widgets/CheckBox.hpp" +#include +#include "libslic3r/Config.hpp" +#include +#include "slic3r/GUI/GUI_Utils.hpp" +#include +#include "slic3r/GUI/Widgets/Label.hpp" +#include "slic3r/GUI/Widgets/LabeledStaticBox.hpp" +#include "slic3r/GUI/Widgets/RadioGroup.hpp" +#include "slic3r/GUI/Widgets/TextInput.hpp" +#include "libslic3r/calib.hpp" +#include "libslic3r/libslic3r.h" +#include "slic3r/GUI/Widgets/ComboBox.hpp" +#include +#include +#include "slic3r/GUI/wxExtensions.hpp" #include #include "MainFrame.hpp" #include "Widgets/DialogButtons.hpp" @@ -9,6 +28,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #include "libslic3r/PrintConfig.hpp" #include "libslic3r/Flow.hpp" #include "libslic3r/Utils.hpp" diff --git a/src/slic3r/GUI/calib_dlg.hpp b/src/slic3r/GUI/calib_dlg.hpp index 3927c5e1fd..da6e9ee7c5 100644 --- a/src/slic3r/GUI/calib_dlg.hpp +++ b/src/slic3r/GUI/calib_dlg.hpp @@ -13,6 +13,8 @@ #include "Widgets/RadioGroup.hpp" #include "GUI_App.hpp" #include "wx/hyperlink.h" +#include +#include #include #include "libslic3r/calib.hpp" diff --git a/src/slic3r/GUI/format.hpp b/src/slic3r/GUI/format.hpp index 51beafff13..e4bbd4d98d 100644 --- a/src/slic3r/GUI/format.hpp +++ b/src/slic3r/GUI/format.hpp @@ -9,6 +9,8 @@ #include +#include +#include #include namespace Slic3r { diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 0857612ac3..26b03a028b 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -1,11 +1,34 @@ #include "wxExtensions.hpp" +#include +#include +#include "slic3r/GUI/BitmapCache.hpp" +#include "libslic3r/Exception.hpp" +#include +#include "libslic3r/Utils.hpp" +#include "slic3r/GUI/Widgets/PopupWindow.hpp" #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#include +#include #include "GUI.hpp" #include "GUI_App.hpp" @@ -20,6 +43,7 @@ #include "../Utils/WxFontUtils.hpp" #include "FilamentBitmapUtils.hpp" #include "../Utils/ColorSpaceConvert.hpp" +#include "libslic3r_version.h" #ifndef __linux__ // msw_menuitem_bitmaps is used for MSW and OSX static std::map msw_menuitem_bitmaps; diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp index 2754b3e5ba..d2d621328d 100644 --- a/src/slic3r/GUI/wxExtensions.hpp +++ b/src/slic3r/GUI/wxExtensions.hpp @@ -1,10 +1,18 @@ #ifndef slic3r_GUI_wxExtensions_hpp_ #define slic3r_GUI_wxExtensions_hpp_ +#include +#include +#include #include +#include +#include #include #include #include +#include +#include +#include #include #include #include @@ -17,6 +25,7 @@ #include #include +#include #include "BitmapCache.hpp" #include "Widgets/PopupWindow.hpp" diff --git a/src/slic3r/GUI/wxMediaCtrl3.cpp b/src/slic3r/GUI/wxMediaCtrl3.cpp index 58e258d7f3..67bf5cf9a3 100644 --- a/src/slic3r/GUI/wxMediaCtrl3.cpp +++ b/src/slic3r/GUI/wxMediaCtrl3.cpp @@ -2,12 +2,24 @@ #include "AVVideoDecoder.hpp" #include "I18N.hpp" #include "libslic3r/Utils.hpp" +#include #include +#include "slic3r/GUI/Printer/BambuTunnel.h" +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include extern "C" { #include #include diff --git a/src/slic3r/GUI/wxMediaCtrl3.h b/src/slic3r/GUI/wxMediaCtrl3.h index 936d5e5ddf..681256a04a 100644 --- a/src/slic3r/GUI/wxMediaCtrl3.h +++ b/src/slic3r/GUI/wxMediaCtrl3.h @@ -9,6 +9,12 @@ #define wxMediaCtrl3_h #include +#include +#include +#include +#include +#include +#include #include "wx/window.h" #include "wx/bitmap.h" #include "wx/uri.h" diff --git a/tests/libslic3r/CMakeLists.txt b/tests/libslic3r/CMakeLists.txt index 3b58efc79a..b935519177 100644 --- a/tests/libslic3r/CMakeLists.txt +++ b/tests/libslic3r/CMakeLists.txt @@ -42,6 +42,7 @@ add_executable(${_TEST_NAME}_tests test_stl.cpp test_triangle_selector.cpp test_meshboolean.cpp + test_trianglemesh_slicer.cpp test_marchingsquares.cpp test_lay_on_face.cpp test_model.cpp diff --git a/tests/libslic3r/test_config.cpp b/tests/libslic3r/test_config.cpp index 00c4d6d170..d7803f300b 100644 --- a/tests/libslic3r/test_config.cpp +++ b/tests/libslic3r/test_config.cpp @@ -421,6 +421,109 @@ SCENARIO("update_diff_values_to_child_config tolerates legacy machine-limit vect } } +TEST_CASE("A variant index comes from the same variant and id, else the id's first variant", "[Config][Variant]") { + const std::vector variant_list{"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard"}; + const std::vector variant_ids{1, 1, 2}; + + SECTION("same variant and id") { + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", 1, variant_list, variant_ids) == 1); + CHECK(Slic3r::find_variant_index("Direct Drive Standard", 2, variant_list, variant_ids) == 2); + } + SECTION("a variant the id lacks falls back to the id's first variant") { + CHECK(Slic3r::find_variant_index("Bowden Standard", 1, variant_list, variant_ids) == 0); + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", 2, variant_list, variant_ids) == 2); + } + SECTION("an id with no variants matches none") { + CHECK(Slic3r::find_variant_index("Direct Drive Standard", 3, variant_list, variant_ids) == -1); + } + SECTION("a negative id or a list without ids matches any id") { + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", -1, variant_list, variant_ids) == 1); + CHECK(Slic3r::find_variant_index("Direct Drive High Flow", 2, variant_list, {}) == 1); + } + SECTION("a variant past a shorter id list gets no variant index") { + CHECK(Slic3r::map_variant_indices(variant_list, {1}, variant_list, variant_ids) == std::vector{0, -1, -1}); + } + SECTION("a list without variant strings has one variant per id, and an empty one a single variant") { + CHECK(Slic3r::map_variant_indices(variant_list, variant_ids, {}, {1, 2}) == std::vector{0, 0, 1}); + CHECK(Slic3r::map_variant_indices(variant_list, variant_ids, {}, {}) == std::vector{0, 0, 0}); + } +} + +SCENARIO("update_diff_values_to_child_config keeps a child's values on variants it does not list", + "[Config][Variant]") { + std::set no_keys; + auto variants = [](std::initializer_list names) { return new Slic3r::ConfigOptionStrings(names); }; + + GIVEN("A filament parent with three variants") { + Slic3r::DynamicPrintConfig parent; + parent.set_key_value("filament_extruder_variant", + variants({"Direct Drive Standard", "Bowden Standard", "Direct Drive High Flow"})); + parent.set_deserialize_strict("nozzle_temperature", "220,220,220"); + + WHEN("the child was saved when the parent had only its first variant") { + Slic3r::DynamicPrintConfig child; + child.set_key_value("filament_extruder_variant", variants({"Direct Drive Standard"})); + child.set_deserialize_strict("nozzle_temperature", "199"); + parent.update_diff_values_to_child_config(child, "", "filament_extruder_variant", + Slic3r::filament_options_with_variant, no_keys); + THEN("the child's value applies to every variant") { + REQUIRE(parent.opt_serialize("nozzle_temperature") == "199,199,199"); + } + } + WHEN("the child lists every variant, in another order") { + Slic3r::DynamicPrintConfig child; + child.set_key_value("filament_extruder_variant", + variants({"Bowden Standard", "Direct Drive High Flow", "Direct Drive Standard"})); + child.set_deserialize_strict("nozzle_temperature", "190,205,199"); + parent.update_diff_values_to_child_config(child, "", "filament_extruder_variant", + Slic3r::filament_options_with_variant, no_keys); + THEN("each variant keeps its own value") { + REQUIRE(parent.opt_serialize("nozzle_temperature") == "199,190,205"); + } + } + WHEN("the child lists no variants") { + Slic3r::DynamicPrintConfig child; + child.set_deserialize_strict("nozzle_temperature", "199"); + parent.update_diff_values_to_child_config(child, "", "filament_extruder_variant", + Slic3r::filament_options_with_variant, no_keys); + THEN("the child's value applies to every variant") { + REQUIRE(parent.opt_serialize("nozzle_temperature") == "199,199,199"); + } + } + } + + GIVEN("A two-extruder printer parent with two variants per extruder") { + Slic3r::DynamicPrintConfig parent; + parent.set_key_value("printer_extruder_variant", + variants({"Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard", "Direct Drive High Flow"})); + parent.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 1, 2, 2})); + parent.set_deserialize_strict("retraction_length", "0.8,0.8,0.8,0.8"); + + WHEN("the child lists only the Standard variant of each extruder") { + Slic3r::DynamicPrintConfig child; + child.set_key_value("printer_extruder_variant", variants({"Direct Drive Standard", "Direct Drive Standard"})); + child.set_key_value("printer_extruder_id", new Slic3r::ConfigOptionInts({1, 2})); + child.set_deserialize_strict("retraction_length", "1.1,2.2"); + parent.update_diff_values_to_child_config(child, "printer_extruder_id", "printer_extruder_variant", + Slic3r::printer_options_with_variant_1, + Slic3r::printer_options_with_variant_2); + THEN("each extruder's High Flow variant takes that extruder's value") { + REQUIRE(parent.opt_serialize("retraction_length") == "1.1,1.1,2.2,2.2"); + } + } + WHEN("the child lists no variants") { + Slic3r::DynamicPrintConfig child; + child.set_deserialize_strict("retraction_length", "1.1"); + parent.update_diff_values_to_child_config(child, "printer_extruder_id", "printer_extruder_variant", + Slic3r::printer_options_with_variant_1, + Slic3r::printer_options_with_variant_2); + THEN("only the first extruder's variants take the child's value") { + REQUIRE(parent.opt_serialize("retraction_length") == "1.1,1.1,0.8,0.8"); + } + } + } +} + // SCENARIO("DynamicPrintConfig JSON serialization", "[Config]") { // WHEN("DynamicPrintConfig is serialized and deserialized") { // auto now = std::chrono::high_resolution_clock::now(); diff --git a/tests/libslic3r/test_trianglemesh_slicer.cpp b/tests/libslic3r/test_trianglemesh_slicer.cpp new file mode 100644 index 0000000000..1e4e32be30 --- /dev/null +++ b/tests/libslic3r/test_trianglemesh_slicer.cpp @@ -0,0 +1,50 @@ +#include + +#include + +#include "libslic3r/TriangleMesh.hpp" +#include "libslic3r/TriangleMeshSlicer.hpp" + +using namespace Slic3r; + +// The slab slicer collects each slab's intersection lines from a parallel loop over the facets. +// Its loops, and therefore the projected polygons, are derived from the order of those lines, so +// the order has to be canonical or the same mesh projects to different polygons run to run. +// The single-threaded projection is the reference; every multi-threaded run must reproduce it +// exactly, vertex order included. +TEST_CASE("Slab slicing projects the same polygons whatever the thread schedule", "[TriangleMeshSlicer]") +{ + // A dense sphere, tilted so no facet is axis aligned: thousands of upward and downward + // facing facets spread over every slab. + indexed_triangle_set mesh = its_make_sphere(10., 0.05); + Transform3d trafo = Transform3d::Identity(); + trafo.rotate(Eigen::AngleAxisd(0.37, Vec3d(0.3, 0.5, 1.).normalized())); + trafo.translate(Vec3d(1., 2., 0.)); + std::vector zs; + for (float z = -9.7f; z < 9.7f; z += 0.2f) + zs.emplace_back(z); + + auto project = [&mesh, &trafo, &zs]() { + std::vector top, bottom; + slice_mesh_slabs(mesh, zs, trafo, &top, &bottom, nullptr, []{}); + return std::make_pair(std::move(top), std::move(bottom)); + }; + + std::pair, std::vector> reference; + { + tbb::global_control single_thread(tbb::global_control::max_allowed_parallelism, 1); + reference = project(); + } + REQUIRE(reference.first.size() == zs.size()); + REQUIRE(std::any_of(reference.first.begin(), reference.first.end(), [](const Polygons &p) { return !p.empty(); })); + REQUIRE(std::any_of(reference.second.begin(), reference.second.end(), [](const Polygons &p) { return !p.empty(); })); + + for (int run = 0; run < 3; ++run) { + DYNAMIC_SECTION("multi-threaded run " << run) + { + auto parallel = project(); + CHECK(parallel.first == reference.first); + CHECK(parallel.second == reference.second); + } + } +}