Drop Cached Bytecode Through the Interpreter in the Module Release Test

The bundled stdlib ships .pyc files that are stale against their sources:
they are compiled when the Python deps are installed, and the copy into the
app does not keep the sources' mtimes. CPython then recompiles every module
it imports and writes the result next to the source. A drag-installed macOS
app rewrites files inside its own bundle on first launch, so its signature
no longer verifies, and read-only installs (AppImage, Flatpak, Program Files)
recompile the same modules on every launch.

Point pycache_prefix at <data_dir>/python/pycache so the interpreter reads
and writes bytecode there. The bundle is never written, the cache survives
between launches, and the data directory is already a plugin read/write root.

.claude/skills/orca-wxwidgets/references/platforms.md

@@ -574,8 +574,7 @@ DMABUF workaround and then branches on `GDK_BACKEND` (an `x11` prefix means the
 paths, when `/proc/driver/nvidia/version` exists and the linked WebKitGTK honours the switch (>= 2.44,
 `WebView::SupportsForceSharedMemory()`), it sets `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` and
 `WEBKIT_FORCE_DMABUF_RENDERER=1` (non-replacing): the proprietary driver cannot back WebKit's hardware
-DMABUF renderer. On a hypervisor guest (`/proc/cpuinfo` `hypervisor` flag) and WebKitGTK >= 2.44 it sets
+DMABUF renderer. On the default path it forces `GDK_BACKEND=x11` when wx lacks EGL and `WAYLAND_DISPLAY`
-`WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` alone, since virtual GPUs cannot back the hardware path either. On the default path it forces `GDK_BACKEND=x11` when wx lacks EGL and `WAYLAND_DISPLAY`
 is set, and sets `WEBKIT_DISABLE_COMPOSITING_MODE=1` (non-replacing) inside that branch when the linked
 WebKitGTK is older than 2.42: a forced X11 backend in a Wayland session is the only default-path case
 that runs through XWayland, which `DISPLAY` and `WAYLAND_DISPLAY` alone do not tell you (a native

.claude/skills/orca-wxwidgets/references/webview-gl-aui-media.md

@@ -568,18 +568,13 @@ vue-resize workaround script and sets a persistent SQLite cookie store on the vi
 ## WebKitGTK on Linux sessions
 
 **Mechanism.** `CLI::run` (`src/OrcaSlicer.cpp`, under `#ifdef __WXGTK__`, before GTK initialises)
-sets the DMABUF workarounds and then branches on `GDK_BACKEND`:
+sets the NVIDIA DMABUF workaround and then branches on `GDK_BACKEND`:
 - **Both paths**, before the split: when `/proc/driver/nvidia/version` exists and the linked WebKitGTK
   honours the switch (>= 2.44, `WebView::SupportsForceSharedMemory()`), it sets
   `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` and `WEBKIT_FORCE_DMABUF_RENDERER=1` non-replacing. The
   proprietary driver cannot back WebKit's hardware DMABUF renderer, so the shared-memory transport keeps
   accelerated compositing instead of dropping it; `WEBKIT_FORCE_DMABUF_RENDERER` clears the
   Debian/Ubuntu/openSUSE `isNVIDIA()` early return, which otherwise returns before the FORCE_SHM check.
-- **Hypervisor guests**, same position: when `is_hypervisor_guest()` (the `hypervisor` flag in
-  `/proc/cpuinfo`) and WebKitGTK >= 2.44, it sets `WEBKIT_DMABUF_RENDERER_FORCE_SHM=1` non-replacing.
-  Virtual GPUs (VirtualBox VMSVGA, VMware, QEMU) cannot back the hardware DMABUF path either, and
-  FORCE_SHM alone was confirmed to fix web views in VirtualBox; the `WEBKIT_FORCE_DMABUF_RENDERER` pair
-  is not needed without the Debian `isNVIDIA()` patch. The flag is x86-only, so ARM guests are not covered.
 - **Default path** (`GDK_BACKEND` unset or not starting with `x11`): if wx lacks EGL (`!wxHAS_EGL`) and
   `WAYLAND_DISPLAY` is set, it forces `GDK_BACKEND=x11`, and in that same branch it sets
   `WEBKIT_DISABLE_COMPOSITING_MODE=1` non-replacing when the linked WebKitGTK predates 2.42
@@ -595,9 +590,9 @@ Runtime backend detection elsewhere uses Orca's `is_running_on_wayland()` / `is_
 (see `references/platforms.md`), not these environment variables.
 
 **Pitfall.**
-- **Rule:** On NVIDIA and hypervisor guests reach for `WEBKIT_DMABUF_RENDERER_FORCE_SHM` before
+- **Rule:** On NVIDIA reach for `WEBKIT_DMABUF_RENDERER_FORCE_SHM` before
-  `WEBKIT_DISABLE_COMPOSITING_MODE`. **Why:** the proprietary driver and virtual GPUs cannot back WebKit's
+  `WEBKIT_DISABLE_COMPOSITING_MODE`. **Why:** the proprietary driver cannot back WebKit's hardware
-  hardware DMABUF renderer, leaving web views blank or slow; FORCE_SHM keeps accelerated compositing and only
+  DMABUF renderer, leaving web views blank or slow; FORCE_SHM keeps accelerated compositing and only
   skips the hardware path, while disabling compositing drops it. Threaded scrolling is a separate,
   release-dependent default (off in 2.44/2.45, on from 2.46). `WEBKIT_DISABLE_DMABUF_RENDERER` is not a
   substitute — it is read first, leaves the transport set empty (no compositing from 2.44 on, where the

.github/workflows/check_profiles.yml

@@ -232,31 +232,6 @@ jobs:
           mkdir -p ${{ runner.temp }}/profile-check-results
           echo "${{ github.event.pull_request.number }}" > ${{ runner.temp }}/profile-check-results/pr_number.txt
 
-      # Builds a readable diff of the custom G-code the PR changes, which GitHub shows as
-      # one long line per setting, for check_profiles_comment.yml to post.
-      - name: Diff custom G-code
-        if: ${{ always() && github.event_name == 'pull_request' }}
-        continue-on-error: true
-        env:
-          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-        run: |
-          git fetch --no-tags --depth=2 origin "$(git rev-parse HEAD)"
-          results=${{ runner.temp }}/profile-check-results
-          diff=${{ runner.temp }}/gcode_diff.md
-          # HEAD is the PR's merge commit, so HEAD^1 is the base it merges onto.
-          python3 ./scripts/orca_profile_tool.py gcode-diff --base HEAD^1 --head HEAD > "$diff"
-          if [ -s "$diff" ]; then
-            {
-              echo "<!-- profile-gcode-diff-comment -->"
-              cat "$diff"
-              echo ""
-              # The comment workflow finds this line as the only one starting with <sub>.
-              echo "<sub>For commit ${PR_HEAD_SHA} of this PR.</sub>"
-            } > "$results/gcode_diff.md"
-          fi
-          # Tells the comment workflow that a missing gcode_diff.md means no G-code changed.
-          touch "$results/gcode_diff_done.txt"
-
       - name: Prepare comment artifact
         if: ${{ always() && github.event_name == 'pull_request' && (steps.profile_tool.outcome == 'failure' || steps.legacy_compat.outcome == 'failure' || steps.validate_system.outcome == 'failure' || steps.validate_slice.outcome == 'failure' || steps.validate_filament_subtypes.outcome == 'failure' || steps.validate_custom.outcome == 'failure') }}
         run: |

.github/workflows/check_profiles_comment.yml

@@ -38,7 +38,6 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           GH_REPO: ${{ github.repository }}
-          HEAD_SHA: ${{ github.event.workflow_run.head_sha }}
         run: |
           if [ ! -f pr_number.txt ]; then
             echo "No pr_number.txt in artifact, skipping."
@@ -50,72 +49,18 @@ jobs:
             echo "Invalid PR number: $PR_NUMBER"
             exit 1
           fi
-          # PR code wrote the artifact, so only a run for the named PR's current head may post.
-          if [ -z "$HEAD_SHA" ]; then
-            echo "The triggering run names no head commit."
-            exit 1
-          fi
-          if ! PR_HEAD=$(gh api "repos/${GH_REPO}/pulls/${PR_NUMBER}" --jq .head.sha); then
-            echo "Cannot look up PR #${PR_NUMBER}."
-            exit 1
-          fi
-          if [ "$HEAD_SHA" != "$PR_HEAD" ]; then
-            echo "${HEAD_SHA} is not the head of PR #${PR_NUMBER}; skipping."
-            exit 0
-          fi
-
-          # Lists every bot comment on the PR, one JSON object per line.
-          COMMENTS=$(gh api --paginate "repos/${GH_REPO}/issues/${PR_NUMBER}/comments" \
-            --jq '.[] | select(.user.login == "github-actions[bot]") | {id, body} | @json')
 
           # Delete prior comments matching the marker (from check_profiles.yml) or the legacy heading.
-          OLD_IDS=$(printf '%s\n' "$COMMENTS" | jq -r 'select((.body | startswith("<!-- profile-validation-comment -->")) or (.body | startswith("## :x: Profile Validation Errors"))) | .id')
+          OLD_IDS=$(gh api --paginate "repos/${GH_REPO}/issues/${PR_NUMBER}/comments" \
+            --jq '.[] | select(.user.login == "github-actions[bot]") | select((.body | startswith("<!-- profile-validation-comment -->")) or (.body | startswith("## :x: Profile Validation Errors"))) | .id')
           for comment_id in $OLD_IDS; do
             echo "Deleting outdated profile-validation comment ${comment_id}"
             gh api -X DELETE "repos/${GH_REPO}/issues/comments/${comment_id}" || true
           done
 
           # Post a new comment only when validation failed (pr_comment.md present).
-          # A failed post fails the job only after the G-code diff is handled.
-          failed=0
           if [ -f pr_comment.md ]; then
-            gh pr comment "$PR_NUMBER" --body-file pr_comment.md || failed=1
+            gh pr comment "$PR_NUMBER" --body-file pr_comment.md
           else
             echo "Validation succeeded; cleaned up prior comments without posting."
           fi
-
-          # Makes the G-code diff comment match gcode_diff.md, or deletes it if there is none.
-          update_gcode_diff_comment() {
-            if [ ! -f gcode_diff_done.txt ]; then
-              echo "The G-code diff step did not finish; leaving any G-code diff comment as it is."
-              return 0
-            fi
-            GCODE_IDS=$(printf '%s\n' "$COMMENTS" | jq -r 'select(.body | startswith("<!-- profile-gcode-diff-comment -->")) | .id')
-            if [ -f gcode_diff.md ] && [ "$(wc -c < gcode_diff.md)" -gt 65536 ]; then
-              echo "gcode_diff.md is over GitHub's comment limit; not posting it."
-              rm gcode_diff.md
-            fi
-            if [ -f gcode_diff.md ] && [ "$(echo "$GCODE_IDS" | wc -w)" -eq 1 ]; then
-              OLD_BODY=$(printf '%s\n' "$COMMENTS" | jq -r --argjson id "$GCODE_IDS" 'select(.id == $id) | .body' | tr -d '\r')
-              NEW_BODY=$(tr -d '\r' < gcode_diff.md)
-              if [ "$OLD_BODY" = "$NEW_BODY" ]; then
-                echo "G-code diff unchanged; keeping comment ${GCODE_IDS}."
-                return 0
-              fi
-              # Edits in place when only the <sub> line differs, since edits notify nobody.
-              if [ "$(grep -v '^<sub>' <<< "$OLD_BODY")" = "$(grep -v '^<sub>' <<< "$NEW_BODY")" ]; then
-                echo "G-code diff unchanged at a new commit; updating comment ${GCODE_IDS}."
-                gh api -X PATCH "repos/${GH_REPO}/issues/comments/${GCODE_IDS}" -F body=@gcode_diff.md > /dev/null
-                return 0
-              fi
-            fi
-            for comment_id in $GCODE_IDS; do
-              echo "Deleting outdated G-code diff comment ${comment_id}"
-              gh api -X DELETE "repos/${GH_REPO}/issues/comments/${comment_id}" || true
-            done
-            if [ -f gcode_diff.md ]; then
-              gh pr comment "$PR_NUMBER" --body-file gcode_diff.md
-            fi
-          }
-          update_gcode_diff_comment
-          exit "$failed"

CMakeLists.txt

@@ -288,19 +288,6 @@ if (APPLE)
     # Type"); Ninja/-Wall does not, and under -Werror it fails Xcode builds on code CI accepts.
     set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION "NO")
 
-    # The Xcode generator ignores CMAKE_<LANG>_COMPILER_LAUNCHER, so hand the launcher to
-    # Xcode's own Compiler Launcher setting, which wraps every clang compile (C, C++,
-    # Objective-C++ and the precompiled header) with one program: the C++ launcher wins when
-    # both are set. The setting takes a single program path, not a CMake launcher list.
-    # Xcode versions without it ignore it and build uncached.
-    if (CMAKE_GENERATOR STREQUAL "Xcode")
-        if (CMAKE_CXX_COMPILER_LAUNCHER)
-            set(CMAKE_XCODE_ATTRIBUTE_C_COMPILER_LAUNCHER "${CMAKE_CXX_COMPILER_LAUNCHER}")
-        elseif (CMAKE_C_COMPILER_LAUNCHER)
-            set(CMAKE_XCODE_ATTRIBUTE_C_COMPILER_LAUNCHER "${CMAKE_C_COMPILER_LAUNCHER}")
-        endif ()
-    endif ()
-
     message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     set(CMAKE_INSTALL_RPATH "$ORIGIN")

build_release_macos.sh

@@ -111,54 +111,6 @@ else
   export CMAKE_POLICY_COMPAT=""
 fi
 
-# Compiler cache, as in build_linux.sh. The program comes from CMAKE_CCACHE, else from a
-# launcher already set in the environment (the CI build sets ccache there), else sccache or
-# ccache from PATH; one program serves both languages. Each run applies its own choice to the
-# build directories, replacing a launcher an earlier run or a hand-run configure recorded.
-CMAKE_CCACHE_ARGS=()
-CCACHE_VAR=""
-for var in CMAKE_CCACHE CMAKE_CXX_COMPILER_LAUNCHER CMAKE_C_COMPILER_LAUNCHER; do
-    if [ -n "${!var:-}" ]; then
-        CCACHE_VAR=$var
-        break
-    fi
-done
-if [ -n "$CCACHE_VAR" ]; then
-    CCACHE_PROGRAM=${!CCACHE_VAR}
-    echo "Checking ${CCACHE_VAR} environment variable for compiler cache program..."
-    CMAKE_CCACHE=$(command -v "${CCACHE_PROGRAM}") || {
-        echo "${CCACHE_VAR} environment variable is set to '${CCACHE_PROGRAM}' but it was not found in PATH."
-        CMAKE_CCACHE=""
-    }
-elif command -v sccache >/dev/null 2>&1 ; then
-    CMAKE_CCACHE=$(command -v sccache)
-elif command -v ccache >/dev/null 2>&1 ; then
-    CMAKE_CCACHE=$(command -v ccache)
-fi
-if [ -n "${CMAKE_CCACHE}" ] ; then
-    echo "${CMAKE_CCACHE} found, enabling compiler caching..."
-    CMAKE_CCACHE_ARGS=(-DCMAKE_C_COMPILER_LAUNCHER="${CMAKE_CCACHE}" -DCMAKE_CXX_COMPILER_LAUNCHER="${CMAKE_CCACHE}")
-    # The same ccache settings as the CI build. Without this sloppiness ccache refuses every
-    # compile that uses the precompiled header, which is most of OrcaSlicer, and skips headers
-    # a checkout has just written. It is added to the sloppiness already configured, and
-    # CCACHE_SLOPPINESS or CCACHE_(NO)DEPEND set in the environment win.
-    if [[ "$(basename "${CMAKE_CCACHE}")" == ccache ]] ; then
-        if [[ -z "${CCACHE_SLOPPINESS+x}" ]] ; then
-            CCACHE_SLOPPINESS=$("${CMAKE_CCACHE}" --get-config sloppiness 2>/dev/null || true)
-            export CCACHE_SLOPPINESS="${CCACHE_SLOPPINESS:+${CCACHE_SLOPPINESS},}pch_defines,time_macros,include_file_mtime,include_file_ctime"
-        fi
-        # Hash the includes the compiler reports instead of preprocessing every miss.
-        if [[ -z "${CCACHE_DEPEND+x}${CCACHE_NODEPEND+x}" ]] ; then
-            export CCACHE_DEPEND=1
-        fi
-    fi
-else
-    echo "Note: ccache or sccache are not found. Install either of them for faster rebuilds."
-    # Clear a launcher recorded by an earlier configure. The entries must be set empty rather
-    # than removed: CMake fills a missing launcher entry from the environment.
-    CMAKE_CCACHE_ARGS=(-DCMAKE_C_COMPILER_LAUNCHER:STRING= -DCMAKE_CXX_COMPILER_LAUNCHER:STRING=)
-fi
-
 echo "Build params:"
 echo " - ARCH: $ARCH"
 echo " - BUILD_CONFIG: $BUILD_CONFIG"
@@ -210,7 +162,6 @@ function build_deps() {
                         -DCMAKE_OSX_ARCHITECTURES:STRING="${_ARCH}" \
                         -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
                         -DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
-                        "${CMAKE_CCACHE_ARGS[@]}" \
                         ${CMAKE_POLICY_COMPAT}
                 fi
                 cmake --build . --config "$BUILD_CONFIG" --target deps
@@ -313,7 +264,6 @@ function build_slicer() {
                     -DCMAKE_OSX_ARCHITECTURES="${_ARCH}" \
                     -DCMAKE_OSX_DEPLOYMENT_TARGET="${OSX_DEPLOYMENT_TARGET}" \
                     -DCMAKE_IGNORE_PREFIX_PATH="${CMAKE_IGNORE_PREFIX_PATH}" \
-                    "${CMAKE_CCACHE_ARGS[@]}" \
                     ${CMAKE_POLICY_COMPAT}
             fi
             cmake --build . --config "$BUILD_CONFIG" --target "$SLICER_BUILD_TARGET"

docs/HLSD/keyboard-shortcuts.md

@@ -53,13 +53,6 @@ Space counts as typing. The speed dial's default is the one bare Space, and
 `MainFrame` leaves it to a focused control that uses Space itself (text fields, buttons,
 combo boxes), so it opens the dial from the canvases and the tab strip only.
 
-`MainFrame::handle_global_shortcut` skips a chord that `KeyChord::edits_text()` reports
-while a text field has the focus (a wx text entry, spin control, web view or ImGui
-InputText), and skips every chord while an ImGui modal is open, as a wx modal dialog
-would. `ImGuiWrapper::owns_key()` reads the active InputText and the popup stack
-directly, since `WantCaptureKeyboard` lags a frame, and is called only when the focus is on
-a visible canvas from `OpenGLManager::create_wxglcanvas()`.
-
 ## Which event a chord matches
 
 Letters, digits and special keys match on `wxEVT_KEY_DOWN`. Its key codes do not depend

localization/i18n/OrcaSlicer.pot

@@ -10657,9 +10657,6 @@ msgstr ""
 msgid "Send Failed"
 msgstr ""
 
-msgid "No available printers"
-msgstr ""
-
 msgid "The name length exceeds the limit."
 msgstr ""
 

resources/profiles/Snapmaker.json

@@ -1,6 +1,6 @@
 {
 	"name": "Snapmaker",
-	"version": "02.04.00.18",
+	"version": "02.04.00.17",
 	"force_update": "0",
 	"description": "Snapmaker configurations",
 	"machine_model_list": [

resources/profiles/Snapmaker/filament/Snapmaker ABS @U1 base.json

@@ -49,8 +49,5 @@
 	],
 	"pressure_advance": [
 		"0.02"
-	],
-	"temperature_vitrification": [
-		"100"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker ASA @U1 base.json

@@ -46,8 +46,5 @@
 	],
 	"fan_min_speed": [
 		"0"
-	],
-	"temperature_vitrification": [
-		"100"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker PETG @U1 base.json

@@ -45,7 +45,7 @@
 		"250"
 	],
 	"temperature_vitrification": [
-		"70"
+		"178"
 	],
 	"fan_max_speed": [
 		"20"

resources/profiles/Snapmaker/filament/Snapmaker PETG Translucent @U1 base.json

@@ -4,8 +4,5 @@
 	"inherits": "fdm_filament_petg",
 	"from": "system",
 	"filament_id": "OFW8lqnb",
-	"instantiation": "false",
+	"instantiation": "false"
-	"temperature_vitrification": [
-		"70"
-	]
 }

resources/profiles/Snapmaker/filament/Snapmaker PETG-CF @U1 base.json

@@ -60,7 +60,7 @@
 		"250"
 	],
 	"temperature_vitrification": [
-		"70"
+		"178"
 	],
 	"fan_max_speed": [
 		"20"

resources/profiles/Snapmaker/filament/Snapmaker PLA @U1 base.json

@@ -34,8 +34,5 @@
 	],
 	"nozzle_temperature": [
 		"220"
-	],
-	"temperature_vitrification": [
-		"45"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker PLA Eco @U1 base.json

@@ -34,8 +34,5 @@
 	],
 	"filament_cooling_final_speed": [
 		"60"
-	],
-	"temperature_vitrification": [
-		"45"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker PLA Glow @U1 base.json

@@ -34,8 +34,5 @@
 	],
 	"nozzle_temperature": [
 		"220"
-	],
-	"temperature_vitrification": [
-		"45"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker PLA Metal @U1 base.json

@@ -40,8 +40,5 @@
 	],
 	"nozzle_temperature": [
 		"220"
-	],
-	"temperature_vitrification": [
-		"45"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker PVA @U1 base.json

@@ -31,8 +31,5 @@
 	],
 	"slow_down_layer_time": [
 		"8"
-	],
-	"temperature_vitrification": [
-		"45"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker TPE @U1.json

@@ -50,8 +50,5 @@
 	"additional_cooling_fan_speed": [
 		"70",
 		"70"
-	],
-	"temperature_vitrification": [
-		"30"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1 base.json

@@ -137,7 +137,7 @@
 		"240"
 	],
 	"temperature_vitrification": [
-		"30"
+		"60"
 	],
 	"nozzle_temperature_range_low": [
 		"200"

resources/profiles/Snapmaker/filament/Snapmaker TPU 95A @U1.json

@@ -302,7 +302,7 @@
 		"-1"
 	],
 	"temperature_vitrification": [
-		"30"
+		"60"
 	],
 	"textured_cool_plate_temp": [
 		"40"

resources/profiles/Snapmaker/filament/Snapmaker TPU @U1.json

@@ -29,8 +29,5 @@
 	"additional_cooling_fan_speed": [
 		"70",
 		"70"
-	],
-	"temperature_vitrification": [
-		"30"
 	]
 }

resources/profiles/Snapmaker/filament/Snapmaker TPU High-Flow @U1.json

@@ -49,8 +49,5 @@
 	"additional_cooling_fan_speed": [
 		"70",
 		"70"
-	],
-	"temperature_vitrification": [
-		"30"
 	]
 }

resources/profiles/Snapmaker/machine/Snapmaker U1 (0.2 nozzle).json

@@ -97,7 +97,7 @@
 		"20",
 		"12"
 	],
-	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\n;===== top cover purifier =====\n{if min_vitrification_temperature <= 50}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=48 FAN_SPEED=0.6 DELAY_OFF=0 ; strong cooling\n{elsif min_vitrification_temperature <= 70}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=45 ALARM_TEMP=51 FAN_SPEED=0.6 DELAY_OFF=0 ; weak cooling\n{else}\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600 ; keep warm\n{endif}\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\n\n;==== 预挤出耗材 =====\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nT{initial_extruder}\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nSM_PRINT_PREEXTRUDE_FILAMENT INDEX={initial_extruder}\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nM107\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nM107\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nM106 S255\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; AlwLine truncated
+	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0\n{endif} \n\n\n;===== 画起始线 =================\nG90\nG1 Z1.5\nG0 X85 Y1 Z2 F18000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nM83\nG1 X185 E15 F360\nG1 Z1.5\n\nG90\nM106 S0",
 	"machine_tool_change_time": "5",
 	"max_layer_height": [
 		"0.14",

resources/profiles/Snapmaker/machine/Snapmaker U1 (0.4 nozzle).json

@@ -97,7 +97,7 @@
 		"20",
 		"12"
 	],
-	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\n;===== top cover purifier =====\n{if min_vitrification_temperature <= 50}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=48 FAN_SPEED=0.6 DELAY_OFF=0 ; strong cooling\n{elsif min_vitrification_temperature <= 70}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=45 ALARM_TEMP=51 FAN_SPEED=0.6 DELAY_OFF=0 ; weak cooling\n{else}\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600 ; keep warm\n{endif}\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\n\n;==== 预挤出耗材 =====\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nT{initial_extruder}\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nSM_PRINT_PREEXTRUDE_FILAMENT INDEX={initial_extruder}\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nM107\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nM107\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nM106 S255\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; AlwLine truncated
+	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0\n{endif} \n\n\n;===== 画起始线 =================\nG90\nG1 Z1.5\nG0 X85 Y1 Z2 F18000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nM83\nG1 X185 E15 F360\nG1 Z1.5\n\nG90\nM106 S0",
 	"machine_tool_change_time": "5",
 	"max_layer_height": [
 		"0.32",

resources/profiles/Snapmaker/machine/Snapmaker U1 (0.6 nozzle).json

@@ -97,7 +97,7 @@
 		"20",
 		"12"
 	],
-	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\n;===== top cover purifier =====\n{if min_vitrification_temperature <= 50}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=48 FAN_SPEED=0.6 DELAY_OFF=0 ; strong cooling\n{elsif min_vitrification_temperature <= 70}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=45 ALARM_TEMP=51 FAN_SPEED=0.6 DELAY_OFF=0 ; weak cooling\n{else}\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600 ; keep warm\n{endif}\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\n\n;==== 预挤出耗材 =====\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nT{initial_extruder}\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nSM_PRINT_PREEXTRUDE_FILAMENT INDEX={initial_extruder}\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nM107\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nM107\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nM106 S255\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; AlwLine truncated
+	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0\n{endif} \n\n\n;===== 画起始线 =================\nG90\nG1 Z1.5\nG0 X85 Y1 Z2 F18000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nM83\nG1 X185 E15 F360\nG1 Z1.5\n\nG90\nM106 S0",
 	"machine_tool_change_time": "5",
 	"max_layer_height": [
 		"0.42",

resources/profiles/Snapmaker/machine/Snapmaker U1 (0.8 nozzle).json

@@ -97,7 +97,7 @@
 		"20",
 		"12"
 	],
-	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\n;===== top cover purifier =====\n{if min_vitrification_temperature <= 50}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=42 ALARM_TEMP=48 FAN_SPEED=0.6 DELAY_OFF=0 ; strong cooling\n{elsif min_vitrification_temperature <= 70}\nSET_PURIFIER_MODE MODE=1 DESIRE_TEMP=45 ALARM_TEMP=51 FAN_SPEED=0.6 DELAY_OFF=0 ; weak cooling\n{else}\nSET_PURIFIER_MODE MODE=3 DESIRE_TEMP=45 FAN_SPEED=0.6 DELAY_OFF=600 ; keep warm\n{endif}\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\n\n;==== 预挤出耗材 =====\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nT{initial_extruder}\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder]}\nSM_PRINT_PREEXTRUDE_FILAMENT INDEX={initial_extruder}\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nM107\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nM107\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nM106 S255\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\nM107\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; AlwLine truncated
+	"machine_start_gcode": "SET_PRINT_AUTO_BED_LEVELING ENABLE=1\nSET_TIME_LAPSE_CAMERA ENABLE=1\n;===== date: 20260128 =====================\n\nPRINT_START\nDEFECT_DETECTION_START\nSET_PRINT_STATS_INFO TOTAL_LAYER={total_layer_count} CURRENT_LAYER=0\nTIMELAPSE_START\nM140 S{bed_temperature_initial_layer_single}\nM104 T{initial_extruder} S140\nM204 S10000\nG28 X Y\nDEFECT_DETECT_NOODLE_FIRST\n;===== 床面异物检测 ========\nT{initial_extruder}\nG90\nDEFECT_DETECTION_DETECT_BED\n;===== 取放头检测 =================\nSM_PRINT_CHECK_SWITCH_EXTRUDER\n\n;===== 自动进料 & 挤出流量 & 预挤出 ======================\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=1 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=0\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=0\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=2 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=1\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=1\nSM_PRINT_EXTRUDER_PREHEAT EXTRUDER=3 TEMP=140\nSM_PRINT_AUTO_FEED EXTRUDER=2\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=2\nSM_PRINT_AUTO_FEED EXTRUDER=3\nSM_PRINT_FLOW_CALIBRATE EXTRUDER=3\nM104 S0 T0 A0\nM104 S0 T1 A0\nM104 S0 T2 A0\nM104 S0 T3 A0\nM104 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\n\n;===== 粗回零 =================\nT{initial_extruder}\nM106 S255\nM106 P2 S0\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 T{initial_extruder} S{nozzle_temperature[initial_extruder] - 90}\nROUGHLY_CLEAN_NOZZLE_WITH_DISCARD\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nG28 Z I140 J140\n\n;===== 检测钢板 =================\nDETECT_BED_PLATE\n\n;===== 深度清洁喷嘴 =================\nG90\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nM109 S{nozzle_temperature[initial_extruder] - 50}\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_1\nM104 S{nozzle_temperature[initial_extruder] - 90}\nG0 Z5 F10000\nMOVE_TO_DISCARD_FILAMENT_POSITION\nROUGHLY_CLEAN_NOZZLE\nMOVE_TO_XY_IDLE_POSITION_EXTRUDER\nFINELY_CLEAN_NOZZLE_STAGE_2\n\n;===== 精回零 =================\nM106 S255\nM109 S{nozzle_temperature[initial_extruder] - 90}\nM190 S{bed_temperature_initial_layer_single}\nM107 P2\nG90\nG0 Z5 F10000\nWAIT_CHAMBER_TEMP TIMEOUT=180\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \nG28 Z Z_OFFSET -0.07                                                                                                                                                                                                                                    \n{else}                                                                                                                                                                                                               \nG28 Z                                                                                                                                                                                                                                                                                                                                                                                                                                                                          \n{endif} \n\n\n;===== 热床调平 =================\n{if curr_bed_type==\"High Temp Plate\"}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 Z_OFFSET=-0.07\n{else}                                                                                                                                                                                                               \n; Always pass `ADAPTIVE_MARGIN=0` because Orca has already handled `adaptive_bed_mesh_margin` internally\n; Make sure to set ADAPTIVE to 0 otherwise Klipper will use it's own adaptive bed mesh logic\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0\n{endif} \n\n\n;===== 画起始线 =================\nG90\nG1 Z1.5\nG0 X85 Y1 Z2 F18000\nM109 S{nozzle_temperature_initial_layer[initial_extruder]}\nG1 Z0.2\nM83\nG1 X185 E15 F360\nG1 Z1.5\n\nG90\nM106 S0",
 	"machine_tool_change_time": "5",
 	"max_layer_height": [
 		"0.56",

scripts/orca_profile_tool.py

@@ -12,7 +12,6 @@ commands:
   trim             delete profile files no <vendor>.json list references
   update-index     regenerate the *_list sections of <vendor>.json
   legacy-compat    write the printers user presets can be migrated back to
-  gcode-diff       print a readable markdown diff of changed custom G-code
 
 options shared by several commands:
   --vendor VENDOR      act on one vendor bundle only; repeatable, empty means all
@@ -95,14 +94,11 @@ parent in the OFL map. filament_vendor / filament_type resolve the same way.
 """
 
 import argparse
-import difflib
 import functools
-import html
 import json
 import os
 import posixpath
 import re
-import subprocess
 import sys
 import uuid
 from collections import Counter, defaultdict
@@ -196,7 +192,6 @@ VECTOR_KEYS = {
 
 PRINT_CONFIG_CPP = os.path.normpath(
     os.path.join(SCRIPTS_DIR, "..", "src", "libslic3r", "PrintConfig.cpp"))
-TAB_CPP = os.path.normpath(os.path.join(SCRIPTS_DIR, "..", "src", "slic3r", "GUI", "Tab.cpp"))
 
 
 @functools.lru_cache(maxsize=None)
@@ -318,11 +313,11 @@ REMEDY_HINTS = {
 }
 
 
-def print_error(msg, file=None):
+def print_error(msg):
-    print(f"\033[91m[ERROR]\033[0m {msg}", file=file)  # Red
+    print(f"\033[91m[ERROR]\033[0m {msg}")  # Red
 
-def print_warning(msg, file=None):
+def print_warning(msg):
-    print(f"\033[93m[WARNING]\033[0m {msg}", file=file)  # Yellow
+    print(f"\033[93m[WARNING]\033[0m {msg}")  # Yellow
 
 def print_info(msg):
     print(f"\033[94m[INFO]\033[0m {msg}")  # Blue
@@ -3214,223 +3209,6 @@ def run_legacy_compat(base_dir, profiles_dir, output, check):
     return 0
 
 
-# ---------------------------------------------------------------------------
-# gcode-diff
-# ---------------------------------------------------------------------------
-
-# UTF-8 bytes, kept well under GitHub's 65,536-character comment limit.
-GCODE_DIFF_BUDGET = 60000
-# The file names a section's summary shows before "and N more".
-GCODE_DIFF_SUMMARY_FILES = 3
-
-GCODE_DIFF_HEADER = (
-    "## Custom G-code changes\n"
-    "\n"
-    "GitHub shows custom G-code in a profile as one long line, so below is a line by line "
-    "diff of each changed G-code or other text setting.\n")
-
-
-@functools.lru_cache(maxsize=None)
-def _text_option_keys():
-    """The string options PrintConfig.cpp defines as G-code or other multi-line text
-    (every *_gcode option, and every one it marks multiline, such as notes), plus the
-    ones Tab.cpp edits as code, such as filename_format."""
-    with open(PRINT_CONFIG_CPP, encoding="utf-8") as f:
-        source = f.read()
-    keys = set()
-    for body in re.split(r"\bdef\s*=\s*this->add(?:_nullable)?\(", source)[1:]:
-        match = re.match(r'"(\w+)",\s*coStrings?\b', body)
-        if match and (match.group(1).endswith("_gcode")
-                      or re.search(r"def->multiline\s*=\s*true", body)):
-            keys.add(match.group(1))
-    if "machine_start_gcode" not in keys:
-        raise RuntimeError(f"{PRINT_CONFIG_CPP} no longer defines machine_start_gcode")
-    # Tab.cpp only adds keys, so a missing file is not an error.
-    try:
-        with open(TAB_CPP, encoding="utf-8") as f:
-            gui = f.read()
-    except OSError:
-        gui = ""
-    keys.update(re.findall(r'get_option\("(\w+)"\);(?:(?!get_option\().)*?\bis_code\s*=\s*true',
-                           gui, re.DOTALL))
-    return frozenset(keys)
-
-
-def _git(cwd, *args, stdin=None):
-    return subprocess.run(["git", "-C", cwd, *args], input=stdin, check=True,
-                          capture_output=True).stdout
-
-
-def _blobs_at(profiles_dir, specs):
-    """{(ref, path): bytes, or None if not a file there} for (ref, path relative to
-    profiles_dir) pairs, all read by one git cat-file process."""
-    prefix = _git(profiles_dir, "rev-parse", "--show-prefix").decode("utf-8").strip()
-    out = _git(profiles_dir, "cat-file", "--batch",
-               stdin="".join(f"{ref}:{prefix}{rel}\n" for ref, rel in specs).encode("utf-8"))
-    blobs, pos = {}, 0
-    for spec in specs:
-        end = out.index(b"\n", pos)
-        header = out[pos:end]
-        pos = end + 1
-        # "<name> missing" and "<name> ambiguous" have no content; "<oid> <type> <size>" does.
-        if header.endswith((b" missing", b" ambiguous")):
-            blobs[spec] = None
-            continue
-        _oid, kind, size = header.split()
-        blobs[spec] = out[pos:pos + int(size)] if kind == b"blob" else None
-        pos += int(size) + 1
-    return blobs
-
-
-def _parse_profile(raw, rel, where):
-    """The JSON in raw, or None with a warning when it is absent or not JSON."""
-    if raw is None:
-        print_warning(f"{rel}: skipped, not found at {where}", file=sys.stderr)
-        return None
-    try:
-        return json.loads(raw.decode("utf-8-sig"))
-    except ValueError as e:
-        print_warning(f"{rel}: skipped, cannot read it at {where}: {e}", file=sys.stderr)
-        return None
-
-
-def _changed_profiles(profiles_dir, base, head):
-    """(old path, new path) of each JSON file under profiles_dir that differs between
-    base and head (the working tree, untracked files included, when None); the absent
-    side of an added or deleted file is None, and so is a side that is not JSON. Renames
-    are paired."""
-    out = _git(profiles_dir, "diff", "--name-status", "-z", "-M", "--relative", base,
-               *([head] if head else []), "--", ".")
-    fields = out.decode("utf-8").split("\0")
-    pairs, i = [], 0
-    while i + 1 < len(fields):
-        status = fields[i]
-        old = new = fields[i + 1]
-        if status[0] in "RC":
-            new = fields[i + 2]
-            i += 3
-        else:
-            i += 2
-        old = None if status[0] == "A" or not old.endswith(".json") else old
-        new = None if status[0] == "D" or not new.endswith(".json") else new
-        if old or new:
-            pairs.append((old, new))
-    if head is None:
-        out = _git(profiles_dir, "ls-files", "-z", "--others", "--exclude-standard", "--", ".")
-        pairs += [(None, rel) for rel in out.decode("utf-8").split("\0")
-                  if rel.endswith(".json") and rel.split("/")[0] != USER_DIR]
-    return pairs
-
-
-def _text_lines(value):
-    return [line.rstrip() for line in value.split("\n")] if value else []
-
-
-def _text_changes(old, new):
-    """(setting, unified diff) for every G-code or other text value that differs
-    between two profiles; a vector option with several values gives one per value."""
-    changes = []
-    for key in list(new) + [k for k in old if k not in new]:
-        a, b = _as_list(old.get(key, [])), _as_list(new.get(key, []))
-        if a == b or not all(isinstance(v, str) for v in a + b):
-            continue
-        if key not in _text_option_keys() and not any("\n" in v for v in a + b):
-            continue
-        width = max(len(a), len(b))
-        for i in range(width):
-            diff = list(difflib.unified_diff(
-                _text_lines(a[i] if i < len(a) else ""), _text_lines(b[i] if i < len(b) else ""),
-                lineterm=""))[2:]  # drops the ---/+++ file header
-            if diff:
-                changes.append((key if width == 1 else f"{key}[{i}]", "\n".join(diff)))
-    return changes
-
-
-def _gcode_diff_section(files, setting, diff):
-    # A fence longer than any backtick run in the G-code cannot be closed by it.
-    fence = "`" * max([3] + [len(run) + 1 for run in re.findall(r"`+", diff)])
-    # In <code>, the "@BBL" of a filament file name does not mention a GitHub user.
-    def code(text):
-        return f"<code>{html.escape(text, quote=False)}</code>"
-    names, listing = ", ".join(map(code, files)), ""
-    if len(files) > GCODE_DIFF_SUMMARY_FILES + 1:  # never "and 1 more"
-        listing = f"<p>{names}</p>\n\n"  # an HTML block, so markdown in names stays literal
-        names = (", ".join(map(code, files[:GCODE_DIFF_SUMMARY_FILES]))
-                 + f" and {len(files) - GCODE_DIFF_SUMMARY_FILES} more")
-    return (f"\n<details>\n<summary><b>{names} - {code(setting)} (click to expand)</b>"
-            f"</summary>\n\n{listing}{fence}diff\n{diff}\n{fence}\n\n</details>\n")
-
-
-def gcode_diff(profiles_dir, base, head=None, vendors=None):
-    """Markdown with one collapsed diff per changed G-code setting between base and
-    head, or "" when none changed. Files whose diff of a setting is identical share
-    one section. Cut to whole sections under GCODE_DIFF_BUDGET."""
-    pairs = [(old, new) for old, new in _changed_profiles(profiles_dir, base, head)
-             if not vendors or any(p and p.split("/")[0] in vendors for p in (old, new))]
-    specs = ([(base, old) for old, _ in pairs if old]
-             + [(head, new) for _, new in pairs if new and head])
-    blobs = _blobs_at(profiles_dir, specs) if specs else {}
-
-    def load(ref, rel):
-        if rel is None:
-            return {}
-        if ref:
-            return _parse_profile(blobs[(ref, rel)], rel, ref)
-        try:
-            return _parse_profile(Path(profiles_dir, rel).read_bytes(), rel, "the working tree")
-        except OSError as e:
-            print_warning(f"{rel}: skipped, cannot read it: {e}", file=sys.stderr)
-            return None
-
-    groups = {}  # (setting, diff) -> files, in the order git lists them
-    for old_rel, new_rel in pairs:
-        old, new = load(base, old_rel), load(head, new_rel)
-        if not isinstance(old, dict) or not isinstance(new, dict):
-            continue
-        for setting, diff in _text_changes(old, new):
-            groups.setdefault((setting, diff), []).append(new_rel or old_rel)
-    if not groups:
-        return ""
-
-    sections = [_gcode_diff_section(files, setting, diff)
-                for (setting, diff), files in groups.items()]
-    budget = GCODE_DIFF_BUDGET - len(GCODE_DIFF_HEADER.encode("utf-8"))
-    shown = 0
-    for section in sections:
-        budget -= len(section.encode("utf-8"))
-        if budget < 0:
-            break
-        shown += 1
-    note, hidden = "", len(sections) - shown
-    if hidden:
-        note = (f"\n{hidden} of {len(sections)} sections {'is' if hidden == 1 else 'are'} not "
-                "shown because the comment would be too long for GitHub. See the Files "
-                "changed tab for the rest.\n")
-    return GCODE_DIFF_HEADER + "".join(sections[:shown]) + note
-
-
-def _default_gcode_diff_base(profiles_dir, head):
-    for main in ("upstream/main", "origin/main"):
-        try:
-            return _git(profiles_dir, "merge-base", head or "HEAD", main).decode().strip()
-        except subprocess.CalledProcessError:
-            continue
-    raise RuntimeError("no --base given, and neither upstream/main nor origin/main exists")
-
-
-def run_gcode_diff(profiles_dir, vendors, base, head):
-    try:
-        markdown = gcode_diff(profiles_dir, base or _default_gcode_diff_base(profiles_dir, head),
-                              head, vendors)
-    # UnicodeDecodeError means git listed a file name that is not UTF-8.
-    except (OSError, RuntimeError, UnicodeDecodeError, subprocess.CalledProcessError) as e:
-        stderr = getattr(e, "stderr", None)
-        print_error(stderr.decode(errors="replace").strip() if stderr else str(e), file=sys.stderr)
-        return 1
-    sys.stdout.write(markdown)
-    return 0
-
-
 # ---------------------------------------------------------------------------
 # CLI
 # ---------------------------------------------------------------------------
@@ -3455,9 +3233,6 @@ examples:
   orca_profile_tool.py legacy-compat --base /tmp/v2.4.2/resources/profiles
       rewrite resources/info/legacy_compatible_printers.json against 2.4.2's
       profiles (git archive v2.4.2 resources/profiles | tar -x -C /tmp/v2.4.2)
-  orca_profile_tool.py gcode-diff > gcode.md
-      the changed custom G-code of the working tree since it left upstream/main,
-      as markdown with one collapsed diff per setting
 
 after adding, renaming or deleting profile files, run in this order:
   normalize -> update-index -> generate-id -> check
@@ -3612,25 +3387,6 @@ def build_parser():
     legacy_cmd.add_argument("--check", action="store_true",
                             help="fail if the map differs from what --base implies; write nothing")
 
-    gcode_cmd = add(
-        "gcode-diff", [vendor_opt, profiles_opt],
-        "print a readable markdown diff of changed custom G-code",
-        "Print, as markdown, a unified diff of every G-code or other multi-line\n"
-        "setting that differs between --base and --head in each changed profile\n"
-        "file, one collapsed section per setting. Files whose diff of a setting is\n"
-        "identical share a section. Trailing spaces are removed from every line, and\n"
-        "the output is cut to whole sections to fit a GitHub comment. Prints nothing\n"
-        "when no such setting changed. CI posts it on profile PRs.\n"
-        "\n"
-        "The settings are the *_gcode and multiline string options PrintConfig.cpp\n"
-        "defines, the options Tab.cpp edits as code (such as filename_format), and any\n"
-        "string value that spans several lines.")
-    gcode_cmd.add_argument("--base", metavar="REF",
-                           help="compare against this git ref (default: the merge base "
-                                "with upstream/main, else origin/main)")
-    gcode_cmd.add_argument("--head", metavar="REF",
-                           help="compare this git ref (default: the working tree)")
-
     return parser
 
 
@@ -3667,9 +3423,6 @@ def main(argv=None):
     if args.command == "legacy-compat":
         return run_legacy_compat(args.base, profiles_dir, args.output, args.check)
 
-    if args.command == "gcode-diff":
-        return run_gcode_diff(profiles_dir, vendors, args.base, args.head)
-
     if args.command == "fix-variant":
         _changed, errors = fix_variant_arrays(profiles_dir, vendors, dry_run=args.dry_run,
                                                strict=args.strict)

scripts/tests/test_profile_tool.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 """Tests for the tree-maintenance half of scripts/orca_profile_tool.py: the
-normalize, trim, update-index, fix-variant, check and gcode-diff commands, and the
+normalize, trim, update-index, fix-variant and check commands, and the subcommand
-subcommand dispatch that reaches them (stdlib unittest, no external deps).
+dispatch that reaches them (stdlib unittest, no external deps).
 
 The id halves are covered by test_filament_id.py and test_setting_id.py.
 
@@ -14,12 +14,9 @@ import json
 import os
 import re
 import shutil
-import stat
-import subprocess
 import sys
 import tempfile
 import unittest
-from unittest import mock
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 
@@ -44,24 +41,7 @@ class Tree:
         os.makedirs(self.profiles)
 
     def cleanup(self):
-        root = os.path.abspath(self.dir)
+        shutil.rmtree(self.dir, ignore_errors=True)
-
-        def writable_retry(func, path, _exc):
-            # Windows refuses to delete read-only files such as git's objects, and POSIX
-            # refuses to delete the entries of a read-only directory.
-            if not os.path.lexists(path):  # already removed, as on a second cleanup
-                return
-            parent = os.path.dirname(os.path.abspath(path))
-            try:
-                if os.path.commonpath([parent, root]) == root:  # never the temp dir itself
-                    os.chmod(parent, stat.S_IRWXU)
-                if not os.path.islink(path):  # chmod would follow it out of the tree
-                    os.chmod(path, stat.S_IRWXU)
-                func(path)
-            except (OSError, ValueError):  # commonpath raises ValueError across drives
-                pass
-        hook = "onexc" if sys.version_info >= (3, 12) else "onerror"
-        shutil.rmtree(self.dir, **{hook: writable_retry})
 
     def index_path(self, vendor):
         return os.path.join(self.profiles, vendor + ".json")
@@ -1429,292 +1409,6 @@ class TestDispatch(TreeCase):
         self.assertEqual(self.t.read("V", "filament/A.json")["type"], "filament")
 
 
-# ---------------------------------------------------------------------------
-# gcode-diff
-# ---------------------------------------------------------------------------
-
-@unittest.skipUnless(shutil.which("git"), "git not installed")
-class TestGcodeDiff(TreeCase):
-    START = "G28\nM104 S200\nG1 Z5"
-
-    def git(self, *args):
-        subprocess.run(["git", "-C", self.t.dir, "-c", "user.name=t", "-c", "user.email=t@t",
-                        "-c", "commit.gpgsign=false", *args], check=True, capture_output=True)
-
-    def printer(self, name, **extra):
-        self.t.write("V", f"machine/{name}.json", {"type": "machine", "name": name, **extra})
-
-    def commit(self):
-        self.git("add", "-A")
-        self.git("commit", "-q", "--allow-empty", "-m", "x")
-
-    @classmethod
-    def setUpClass(cls):
-        # git's list of the variables that tie a process to a repository, asked with no
-        # GIT_* set since a stray GIT_DIR fails the query.
-        clean = {k: v for k, v in os.environ.items() if not k.startswith("GIT_")}
-        cls.repo_env_vars = set(subprocess.run(
-            ["git", "rev-parse", "--local-env-vars"], env=clean, check=True,
-            capture_output=True, text=True).stdout.split())
-
-    def setUp(self):
-        super().setUp()
-        # A git hook's GIT_DIR or GIT_INDEX_FILE would point every git call here, the
-        # tool's included, at the real repository instead of the temp tree.
-        env = {k: v for k, v in os.environ.items() if k not in self.repo_env_vars}
-        patcher = mock.patch.dict(os.environ, env, clear=True)
-        patcher.start()
-        self.addCleanup(patcher.stop)
-        self.git("init", "-q")
-        for name in ("A", "B", "C"):
-            self.printer(name, machine_start_gcode=self.START, nozzle_diameter=["0.4"])
-        self.printer("Gone", machine_end_gcode="M84")
-        self.commit()
-
-    def diff(self):
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD")
-        self.assertEqual(rc, 0, out)
-        return out
-
-    def test_identical_edits_share_one_section(self):
-        for name in ("A", "B"):
-            self.printer(name, machine_start_gcode="G28\nM104 S210  \nG1 Z5")
-        self.printer("C", machine_start_gcode="G28\nM104 S220\nG1 Z5")
-        out = self.diff()
-        self.assertEqual(out.count("<details>"), 2)
-        self.assertIn("<code>V/machine/A.json</code>, <code>V/machine/B.json</code> - "
-                      "<code>machine_start_gcode</code>", out)
-        self.assertIn("<code>V/machine/C.json</code> - <code>machine_start_gcode</code>", out)
-        # Trailing spaces are removed.
-        self.assertIn("\n-M104 S200\n+M104 S210\n", out)
-        self.assertIn("\n\n```diff\n@@ ", out)
-        self.assertIn("\n```\n\n</details>", out)
-
-    def test_nothing_is_printed_without_a_text_change(self):
-        self.printer("A", machine_start_gcode=self.START, nozzle_diameter=["0.6"])
-        self.assertEqual(self.diff(), "")
-
-    def test_added_and_deleted_files_show_the_whole_value(self):
-        # An untracked file counts as added; the validator's user dir is not a profile.
-        self.printer("New", machine_start_gcode="G28\nG29")
-        self.t.write("user", "default/machine/U.json", {"machine_start_gcode": "G28"})
-        os.remove(self.t.path("V", "machine/Gone.json"))
-        out = self.diff()
-        self.assertIn("@@ -0,0 +1,2 @@\n+G28\n+G29\n", out)
-        self.assertIn("<code>V/machine/Gone.json</code> - <code>machine_end_gcode</code>", out)
-        self.assertIn("@@ -1 +0,0 @@\n-M84\n", out)
-        self.assertNotIn("U.json", out)
-
-    def test_a_multi_line_value_counts_whatever_its_key(self):
-        self.printer("A", machine_start_gcode=self.START, custom_note="one\ntwo")
-        self.assertIn("<code>V/machine/A.json</code> - <code>custom_note</code>", self.diff())
-
-    def test_a_file_name_cannot_mention_a_user(self):
-        self.t.write("V", "filament/PLA @BBL A1.json", {"filament_start_gcode": ["M106"]})
-        self.assertIn("<code>V/filament/PLA @BBL A1.json</code>", self.diff())
-
-    def test_head_compares_two_commits(self):
-        self.printer("A", machine_start_gcode="G28")
-        self.commit()
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD~1", "--head", "HEAD")
-        self.assertEqual(rc, 0, out)
-        self.assertIn("<code>V/machine/A.json</code> - <code>machine_start_gcode</code>", out)
-
-    def test_a_renamed_file_diffs_against_its_old_self(self):
-        os.rename(self.t.path("V", "machine/A.json"), self.t.path("V", "machine/A2.json"))
-        self.printer("A2", machine_start_gcode="G28\nM104 S210\nG1 Z5", nozzle_diameter=["0.4"])
-        self.commit()
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD~1", "--head", "HEAD")
-        self.assertEqual(rc, 0, out)
-        self.assertIn("<code>V/machine/A2.json</code> - <code>machine_start_gcode</code>", out)
-        self.assertIn("\n G28\n-M104 S200\n+M104 S210\n G1 Z5\n", out)
-
-    def test_a_file_renamed_off_json_loses_its_values(self):
-        os.rename(self.t.path("V", "machine/Gone.json"), self.t.path("V", "machine/Gone.json.bak"))
-        self.commit()
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD~1", "--head", "HEAD")
-        self.assertEqual(rc, 0, out)
-        self.assertIn("<code>V/machine/Gone.json</code> - <code>machine_end_gcode</code>", out)
-        self.assertIn("@@ -1 +0,0 @@\n-M84\n", out)
-
-    def test_a_file_renamed_onto_json_is_new(self):
-        with open(self.t.path("V", "machine/Draft.txt"), "w", encoding="utf-8") as f:
-            json.dump({"type": "machine", "machine_start_gcode": self.START}, f)
-        self.commit()
-        os.rename(self.t.path("V", "machine/Draft.txt"), self.t.path("V", "machine/Draft.json"))
-        self.commit()
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD~1", "--head", "HEAD")
-        self.assertEqual(rc, 0, out)
-        self.assertIn("@@ -0,0 +1,3 @@\n+G28\n+M104 S200\n+G1 Z5\n", out)
-
-    def test_a_batch_read_survives_paths_that_are_not_files(self):
-        blobs = apt._blobs_at(self.t.profiles, [("HEAD", "V/machine"), ("HEAD", "V/no such.json"),
-                                                ("HEAD", "V/machine/Gone.json")])
-        self.assertIsNone(blobs[("HEAD", "V/machine")])
-        self.assertIsNone(blobs[("HEAD", "V/no such.json")])
-        self.assertEqual(json.loads(blobs[("HEAD", "V/machine/Gone.json")])["machine_end_gcode"],
-                         "M84")
-
-    def test_each_value_of_a_vector_option_is_its_own_setting(self):
-        self.t.write("V", "filament/F.json", {"filament_start_gcode": ["M106", "M107"]})
-        self.commit()
-        self.t.write("V", "filament/F.json", {"filament_start_gcode": ["M106", "M106 S0"]})
-        out = self.diff()
-        self.assertEqual(out.count("<details>"), 1)
-        self.assertIn("<code>filament_start_gcode[1]</code>", out)
-
-    def test_vendor_limits_the_files(self):
-        self.printer("A", machine_start_gcode="G28")
-        self.t.write("W", "machine/X.json", {"machine_start_gcode": "G28"})
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD", "--vendor", "V")
-        self.assertEqual(rc, 0, out)
-        self.assertIn("V/machine/A.json", out)
-        self.assertNotIn("W/machine/X.json", out)
-
-    def test_vendor_includes_files_moved_out_of_it(self):
-        self.t.add_vendor("W")
-        os.rename(self.t.path("V", "machine/A.json"), self.t.path("W", "machine/A.json"))
-        data = self.t.read("W", "machine/A.json")
-        self.t.write("W", "machine/A.json", {**data, "machine_start_gcode": "G28\nM104 S210\nG1 Z5"})
-        self.commit()
-        rc, out = self.run_command("gcode-diff", "--base", "HEAD~1", "--head", "HEAD",
-                                   "--vendor", "V")
-        self.assertEqual(rc, 0, out)
-        self.assertIn("<code>W/machine/A.json</code> - <code>machine_start_gcode</code>", out)
-
-    def same_edit(self, names):
-        """The diff after one start G-code edit to each of names; returns (summary, output)."""
-        for name in names:
-            self.printer(name, machine_start_gcode=self.START, nozzle_diameter=["0.4"])
-        self.commit()
-        for name in names:
-            self.printer(name, machine_start_gcode="G28")
-        out = self.diff()
-        return re.search(r"<summary>(.*)</summary>", out).group(1), out
-
-    def test_a_long_file_list_moves_into_the_section(self):
-        summary, out = self.same_edit("ABCDE")
-        self.assertIn("<code>V/machine/C.json</code> and 2 more - ", summary)
-        self.assertNotIn("D.json", summary)
-        self.assertIn("<code>V/machine/D.json</code>, <code>V/machine/E.json</code></p>\n\n```diff",
-                      out)
-
-    def test_four_files_are_all_named_in_the_summary(self):
-        summary, _out = self.same_edit("ABCD")
-        self.assertIn("<code>V/machine/D.json</code> - ", summary)
-        self.assertNotIn("more", summary)
-
-    def test_an_error_goes_to_stderr_only(self):
-        err = io.StringIO()
-        with contextlib.redirect_stderr(err):
-            rc, out = self.run_command("gcode-diff", "--base", "no-such-ref")
-        self.assertEqual(rc, 1)
-        self.assertEqual(out, "")
-        self.assertIn("no-such-ref", err.getvalue())
-
-    def test_a_file_name_that_is_not_utf8_is_an_error(self):
-        bad = UnicodeDecodeError("utf-8", b"\xe9.json", 0, 1, "invalid continuation byte")
-        err = io.StringIO()
-        with mock.patch.object(apt, "_changed_profiles", side_effect=bad), \
-                contextlib.redirect_stderr(err):
-            rc, out = self.run_command("gcode-diff", "--base", "HEAD")
-        self.assertEqual((rc, out), (1, ""))
-        self.assertIn("invalid continuation byte", err.getvalue())
-
-    def test_output_is_cut_to_whole_sections(self):
-        for name in ("A", "B", "C"):
-            self.printer(name, machine_start_gcode=name * 300)
-        size = len(apt.gcode_diff(self.t.profiles, "HEAD").encode("utf-8"))
-        with mock.patch.object(apt, "GCODE_DIFF_BUDGET", size - 1):
-            out = self.diff()
-        self.assertEqual(out.count("<details>"), 2)
-        self.assertEqual(out.count("</details>"), 2)
-        self.assertIn("\n1 of 3 sections is not shown", out)
-        with mock.patch.object(apt, "GCODE_DIFF_BUDGET", 1):
-            self.assertIn("\n3 of 3 sections are not shown", self.diff())
-
-    def test_cleanup_removes_the_repo(self):
-        # setUp's commit leaves read-only git objects, and a read-only directory blocks
-        # deletion on POSIX.
-        os.chmod(self.t.path("V", "machine"), stat.S_IRUSR | stat.S_IXUSR)
-        self.t.cleanup()
-        self.assertFalse(os.path.exists(self.t.dir))
-        with mock.patch.object(os, "chmod") as chmod:
-            self.t.cleanup()  # a second cleanup, as addCleanup runs, must not touch the temp dir
-        chmod.assert_not_called()
-
-    def test_only_repository_variables_are_stripped(self):
-        self.assertTrue({"GIT_DIR", "GIT_WORK_TREE", "GIT_INDEX_FILE"} <= self.repo_env_vars)
-        self.assertFalse({"GIT_SSH", "GIT_EXEC_PATH", "GIT_EDITOR"} & self.repo_env_vars)
-
-    def test_cleanup_leaves_symlink_targets_alone(self):
-        outside = tempfile.mkdtemp(prefix="profile_tool_outside_")
-        self.addCleanup(shutil.rmtree, outside, True)
-        target = os.path.join(outside, "f")
-        open(target, "w").close()
-        os.chmod(target, stat.S_IRUSR)
-        self.addCleanup(os.chmod, target, stat.S_IRWXU)  # runs before the rmtree above
-        machine = self.t.path("V", "machine")
-        try:
-            os.symlink(target, os.path.join(machine, "link"))
-        except (OSError, NotImplementedError):
-            self.skipTest("cannot create symlinks here")
-        os.chmod(machine, stat.S_IRUSR | stat.S_IXUSR)  # so removing the link fails at first
-        self.t.cleanup()
-        self.assertFalse(os.path.exists(self.t.dir))
-        self.assertEqual(stat.S_IMODE(os.stat(target).st_mode) & stat.S_IWUSR, 0)
-
-    def test_a_git_hook_environment_is_ignored(self):
-        scripts = os.path.join(REPO_ROOT, "scripts")
-        result = subprocess.run(
-            [sys.executable, "-m", "unittest",
-             "tests.test_profile_tool.TestGcodeDiff.test_head_compares_two_commits"],
-            cwd=scripts, capture_output=True, text=True,
-            env={**os.environ, "GIT_DIR": os.path.join(self.t.dir, "nowhere")})
-        self.assertEqual(result.returncode, 0, result.stderr)
-
-    def test_the_options_are_read_from_the_engine(self):
-        keys = apt._text_option_keys()
-        self.assertTrue({"machine_start_gcode", "filament_start_gcode", "printing_by_object_gcode",
-                         "notes", "post_process"} <= keys)
-        self.assertNotIn("emit_machine_limits_to_gcode", keys)  # a coBool
-
-    START_DEF = 'def = this->add("machine_start_gcode", coString);\n'
-
-    def keys_from(self, print_config, tab=None):
-        """_text_option_keys read from these sources; no tab means no Tab.cpp."""
-        paths = [os.path.join(self.t.dir, "PrintConfig.cpp"), os.path.join(self.t.dir, "Tab.cpp")]
-        for path, text in zip(paths, (print_config, tab)):
-            if text is not None:
-                with open(path, "w", encoding="utf-8") as f:
-                    f.write(text)
-        apt._text_option_keys.cache_clear()
-        self.addCleanup(apt._text_option_keys.cache_clear)
-        with mock.patch.object(apt, "PRINT_CONFIG_CPP", paths[0]), \
-                mock.patch.object(apt, "TAB_CPP", paths[1]):
-            return apt._text_option_keys()
-
-    def test_multiline_is_read_whatever_its_spacing(self):
-        keys = self.keys_from(self.START_DEF + 'def = this->add("printer_notes", coString);\n'
-                                               '    def->multiline  = true;\n')
-        self.assertIn("printer_notes", keys)
-
-    def test_the_code_options_of_tab_cpp_are_read(self):
-        keys = self.keys_from(self.START_DEF, 'option = optgroup->get_option("filename_format");\n'
-                                              'option.opt.is_code = true;\n'
-                                              'option = optgroup->get_option("layer_height");\n')
-        self.assertIn("filename_format", keys)
-        self.assertNotIn("layer_height", keys)
-
-    def test_a_missing_tab_cpp_is_not_an_error(self):
-        self.assertIn("machine_start_gcode", self.keys_from(self.START_DEF))
-
-    def test_markdown_in_a_file_name_stays_literal(self):
-        section = apt._gcode_diff_section(["V/a *b*.json", "V/c.json", "V/d.json", "V/e.json",
-                                           "V/f.json"], "machine_start_gcode", "@@ -1 +1 @@")
-        self.assertIn("\n<p><code>V/a *b*.json</code>, ", section)
-
-
 # ---------------------------------------------------------------------------
 # the real tree
 # ---------------------------------------------------------------------------

src/OrcaSlicer.cpp

@@ -1126,19 +1126,6 @@ static void load_downward_settings_list_from_config(std::string config_file, std
     }
 }
 
-#ifdef __WXGTK__
-// Virtual GPUs (VirtualBox, VMware, QEMU) cannot back WebKit's hardware DMABUF renderer.
-static bool is_hypervisor_guest()
-{
-    std::ifstream cpuinfo("/proc/cpuinfo");
-    std::string line;
-    while (std::getline(cpuinfo, line))
-        if (boost::starts_with(line, "flags"))
-            return line.find(" hypervisor") != std::string::npos;
-    return false;
-}
-#endif
-
 int CLI::run(int argc, char **argv)
 {
     // Mark the main thread for the debugger and for runtime checks.
@@ -1189,9 +1176,6 @@ int CLI::run(int argc, char **argv)
             ::setenv("WEBKIT_FORCE_DMABUF_RENDERER", "1", /* replace */ false);
         }
 
-        if (is_hypervisor_guest() && WebView::SupportsForceSharedMemory())
-            ::setenv("WEBKIT_DMABUF_RENDERER_FORCE_SHM", "1", /* replace */ false);
-
         if (x11_opt_in) {
             // ===== X11 / XWayland (opted in via GDK_BACKEND=x11) =====
             BOOST_LOG_TRIVIAL(info) << "GDK_BACKEND=x11 detected; applying v2.3.2 X11/XWayland workarounds.";

src/libslic3r/Arachne/WallToolPaths.cpp

@@ -812,8 +812,7 @@ bool WallToolPaths::removeEmptyToolPaths(std::vector<VariableWidthLines> &toolpa
      * Get the order constraints of the insets when printing walls per region / hole.
      * Each returned pair consists of adjacent wall lines where the left has an inset_idx one lower than the right.
      *
-     * Odd walls follow the same order as even ones, so that the centre line of a narrow wall is an inner wall
+     * Odd walls should always go after their enclosing wall polygons.
-     * like any other when printing inner to outer.
      *
      * \param outer_to_inner Whether the wall polygons with a lower inset_idx should go before those with a higher one.
  */
@@ -887,7 +886,12 @@ WallToolPaths::ExtrusionLineSet WallToolPaths::getRegionOrder(const std::vector<
                 continue; // not directly adjacent
             if (!shorter_then(loc_here - lineloc_nearby.j.p, (lineloc_here.j.w + lineloc_nearby.j.w) / 2 * diagonal_extension))
                 continue; // points are too far away from each other
-            if ((nearby->inset_idx < here->inset_idx) == outer_to_inner) {
+            if (here->is_odd || nearby->is_odd) {
+                if (here->is_odd && !nearby->is_odd && nearby->inset_idx < here->inset_idx)
+                    order_requirements.emplace(std::make_pair(nearby, here));
+                if (nearby->is_odd && !here->is_odd && here->inset_idx < nearby->inset_idx)
+                    order_requirements.emplace(std::make_pair(here, nearby));
+            } else if ((nearby->inset_idx < here->inset_idx) == outer_to_inner) {
                 order_requirements.emplace(std::make_pair(nearby, here));
             } else {
                 assert((nearby->inset_idx > here->inset_idx) == outer_to_inner);

src/libslic3r/Format/bbs_3mf.cpp

@@ -988,7 +988,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
 
             MetadataList metadata;
             VolumeMetadataList volumes;
-            std::optional<bool> auto_drop;
+            bool auto_drop { true };
         };
 
         struct CutObjectInfo
@@ -1208,7 +1208,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
         //IdToGeometryMap m_orig_geometries; // backup & restore
         CurrentConfig m_curr_config;
         IdToMetadataMap m_objects_metadata;
-        std::set<int>   m_items_auto_drop_off; // object ids with a build item auto_drop="0" (2.4.x layout)
         IdToCutObjectInfoMap       m_cut_object_infos;
         IdToLayerHeightsProfileMap m_layer_heights_profiles;
         IdToLayerConfigRangesMap m_layer_config_ranges;
@@ -1464,7 +1463,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
         m_objects.clear();
         m_instances.clear();
         m_objects_metadata.clear();
-        m_items_auto_drop_off.clear();
         m_curr_metadata_name.clear();
         m_curr_characters.clear();
 
@@ -1504,7 +1502,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
         m_curr_config.object_id = -1;
         m_curr_config.volume_id = -1;
         m_objects_metadata.clear();
-        m_items_auto_drop_off.clear();
         m_layer_heights_profiles.clear();
         m_layer_config_ranges.clear();
         m_brim_ear_points.clear();
@@ -2260,14 +2257,11 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
             ObjectMetadata::VolumeMetadataList volumes;
             ObjectMetadata::VolumeMetadataList* volumes_ptr = nullptr;
 
-            // 2.4.x stored auto_drop on build items, shared by all instances of an object; any "off" wins
-            const bool legacy_auto_drop = !m_items_auto_drop_off.count(object.first.second);
-
             IdToMetadataMap::iterator obj_metadata = m_objects_metadata.find(object.first.second);
             if (obj_metadata != m_objects_metadata.end()) {
                 // config data has been found, this model was saved using slic3r pe
 
-                model_object->auto_drop = obj_metadata->second.auto_drop.value_or(legacy_auto_drop);
+                model_object->auto_drop = obj_metadata->second.auto_drop;
 
                 // apply object's name and config data
                 for (const Metadata& metadata : obj_metadata->second.metadata) {
@@ -2285,7 +2279,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
             }
             else {
                 // config data not found, this model was not saved using slic3r pe
-                model_object->auto_drop = legacy_auto_drop;
 
                 // add the entire geometry as the single volume to generate
                 //volumes.emplace_back(0, (int)obj_geometry->second.triangles.size() - 1);
@@ -4128,8 +4121,6 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
         std::string path = bbs_get_attribute_value_string(attributes, num_attributes, PPATH_ATTR);
         Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR));
         int printable = bbs_get_attribute_value_bool(attributes, num_attributes, PRINTABLE_ATTR);
-        if (const char* auto_drop = bbs_get_attribute_value_charptr(attributes, num_attributes, AUTO_DROP_ATTR); auto_drop != nullptr && !::atoi(auto_drop))
-            m_items_auto_drop_off.insert(object_id);
         return !m_load_model || _create_object_instance(path, object_id, transform, printable, 1);
     }
 
@@ -4498,8 +4489,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
         // int instances_count_id = bbs_get_attribute_value_int(attributes, num_attributes, INSTANCESCOUNT_ATTR);
 
         ObjectMetadata metadata;
-        if (bbs_get_attribute_value_charptr(attributes, num_attributes, AUTO_DROP_ATTR) != nullptr)
+        metadata.auto_drop = bbs_get_attribute_value_bool(attributes, num_attributes, AUTO_DROP_ATTR);
-            metadata.auto_drop = bbs_get_attribute_value_bool(attributes, num_attributes, AUTO_DROP_ATTR);
         m_objects_metadata.insert({ object_id, std::move(metadata) });
         m_curr_config.object_id = object_id;
         return true;

src/libslic3r/GCode.cpp

@@ -3985,16 +3985,6 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
     this->placeholder_parser().set("print_time_minute", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Print_Time_Minute_Placeholder)));
     this->placeholder_parser().set("print_time_sec", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Print_Time_Sec_Placeholder)));
     this->placeholder_parser().set("used_filament_length", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Used_Filament_Length_Placeholder)));
-    // The final print statistics are known only after the whole G-code is generated, so they are filled in during post-processing too.
-    // The running extruded_* totals are left alone; profiles use them as numbers.
-    this->placeholder_parser().set("used_filament", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Used_Filament_Length_Placeholder)));
-    this->placeholder_parser().set("print_time", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Normal_Print_Time_Placeholder)));
-    this->placeholder_parser().set("normal_print_time", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Normal_Print_Time_Placeholder)));
-    this->placeholder_parser().set("silent_print_time", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Silent_Print_Time_Placeholder)));
-    this->placeholder_parser().set("total_weight", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Weight_Placeholder)));
-    this->placeholder_parser().set("total_cost", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Cost_Placeholder)));
-    this->placeholder_parser().set("total_wipe_tower_cost", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Wipe_Tower_Cost_Placeholder)));
-    this->placeholder_parser().set("total_wipe_tower_filament", new ConfigOptionString(GCodeProcessor::reserved_tag(GCodeProcessor::ETags::Total_Wipe_Tower_Filament_Placeholder)));
 
     // Sync variant-mapped params into placeholder_parser before processing start gcode
     update_placeholder_parser_with_variant_params();

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -120,13 +120,7 @@ const std::vector<std::string> GCodeProcessor::Reserved_Tags = {
     "@PRINT_TIME_HOUR@",
     "@PRINT_TIME_MINUTE@",
     "@PRINT_TIME_SEC@",
-    "@USED_FILAMENT_LENGTH@",
+    "@USED_FILAMENT_LENGTH@"
-    "@NORMAL_PRINT_TIME@",
-    "@SILENT_PRINT_TIME@",
-    "@TOTAL_WEIGHT@",
-    "@TOTAL_COST@",
-    "@TOTAL_WIPE_TOWER_COST@",
-    "@TOTAL_WIPE_TOWER_FILAMENT@"
 };
 
 const std::vector<std::string> GCodeProcessor::Reserved_Tags_compatible = {
@@ -153,13 +147,7 @@ const std::vector<std::string> GCodeProcessor::Reserved_Tags_compatible = {
     "@PRINT_TIME_HOUR@",
     "@PRINT_TIME_MINUTE@",
     "@PRINT_TIME_SEC@",
-    "@USED_FILAMENT_LENGTH@",
+    "@USED_FILAMENT_LENGTH@"
-    "@NORMAL_PRINT_TIME@",
-    "@SILENT_PRINT_TIME@",
-    "@TOTAL_WEIGHT@",
-    "@TOTAL_COST@",
-    "@TOTAL_WIPE_TOWER_COST@",
-    "@TOTAL_WIPE_TOWER_FILAMENT@"
 };
 
 
@@ -1276,22 +1264,19 @@ void GCodeProcessor::run_post_process()
         return ret;
     };
 
-    // Process inline placeholders (print_time_*, used_filament_length and the print statistics known only after export)
+    // Process inline placeholders (print_time_total_sec, print_time_day, print_time_hour, print_time_minute, print_time_sec and used_filament_length)
     auto process_inline_placeholders = [&](std::string& gcode_line) {
         bool processed = false;
         // Every inline placeholder contains '@', so a line without one has nothing to replace.
         if (gcode_line.find('@') == std::string::npos)
             return processed;
 
-        auto replace_tag = [&gcode_line, &processed](ETags tag, const std::string& value) {
+        const std::string& print_time_total_placeholder = reserved_tag(ETags::Print_Time_Total_Sec_Placeholder);
-            const std::string& placeholder = reserved_tag(tag);
+        const std::string& print_time_day_placeholder = reserved_tag(ETags::Print_Time_Day_Placeholder);
-            size_t pos = gcode_line.find(placeholder);
+        const std::string& print_time_hour_placeholder = reserved_tag(ETags::Print_Time_Hour_Placeholder);
-            while (pos != std::string::npos) {
+        const std::string& print_time_minute_placeholder = reserved_tag(ETags::Print_Time_Minute_Placeholder);
-                gcode_line.replace(pos, placeholder.length(), value);
+        const std::string& print_time_sec_placeholder = reserved_tag(ETags::Print_Time_Sec_Placeholder);
-                processed = true;
+        const std::string& used_filament_placeholder = reserved_tag(ETags::Used_Filament_Length_Placeholder);
-                pos = gcode_line.find(placeholder, pos + value.length());
-            }
-        };
 
         double print_time_total_sec = m_time_processor.machines[static_cast<size_t>(PrintEstimatedStatistics::ETimeMode::Normal)].time;
         if (print_time_total_sec < 0.0)
@@ -1304,31 +1289,70 @@ void GCodeProcessor::run_post_process()
         int print_time_minute = (day_remainder_seconds % 3600) / 60;
         int print_time_sec = day_remainder_seconds % 60;
 
-        double total_filament_mm = 0.0;
+        // Replace print_time_total_sec
-        for (const auto& mm : filament_mm) {
+        size_t pos = gcode_line.find(print_time_total_placeholder);
-            total_filament_mm += mm;
+        while (pos != std::string::npos) {
+            char buf[64];
+            sprintf(buf, "%.2f", print_time_total_sec);
+            gcode_line.replace(pos, print_time_total_placeholder.length(), buf);
+            processed = true;
+            pos = gcode_line.find(print_time_total_placeholder, pos + strlen(buf));
         }
 
-        replace_tag(ETags::Print_Time_Total_Sec_Placeholder, Slic3r::float_to_string_decimal_point(print_time_total_sec, 2));
+        // Replace print_time_day
-        replace_tag(ETags::Print_Time_Day_Placeholder, std::to_string(print_time_day));
+        pos = gcode_line.find(print_time_day_placeholder);
-        replace_tag(ETags::Print_Time_Hour_Placeholder, std::to_string(print_time_hour));
+        while (pos != std::string::npos) {
-        replace_tag(ETags::Print_Time_Minute_Placeholder, std::to_string(print_time_minute));
+            char buf[64];
-        replace_tag(ETags::Print_Time_Sec_Placeholder, std::to_string(print_time_sec));
+            sprintf(buf, "%d", print_time_day);
-        replace_tag(ETags::Used_Filament_Length_Placeholder,
+            gcode_line.replace(pos, print_time_day_placeholder.length(), buf);
-                    Slic3r::float_to_string_decimal_point(total_filament_mm / 1000.0, 2)); // Convert mm to m
+            processed = true;
-        // Same values as the print statistics that filename_format gets (PrintStatistics::config(), filled in by
+            pos = gcode_line.find(print_time_day_placeholder, pos + strlen(buf));
-        // update_print_estimated_stats() in GCode.cpp), which runs only after this post-processing.
+        }
-        replace_tag(ETags::Normal_Print_Time_Placeholder, get_time_dhm(PrintEstimatedStatistics::ETimeMode::Normal));
+
-        replace_tag(ETags::Silent_Print_Time_Placeholder, is_stealth_time_estimator_enabled() ?
+        // Replace print_time_hour
-                                                              get_time_dhm(PrintEstimatedStatistics::ETimeMode::Stealth) :
+        pos = gcode_line.find(print_time_hour_placeholder);
-                                                              short_time("N/A"));
+        while (pos != std::string::npos) {
-        const double total_cost = filament_total_cost + m_print->config().time_cost.value * print_time_total_sec / 3600.0;
+            char buf[64];
-        replace_tag(ETags::Total_Weight_Placeholder, Slic3r::float_to_string_decimal_point(filament_total_g, 2));
+            sprintf(buf, "%d", print_time_hour);
-        replace_tag(ETags::Total_Cost_Placeholder, Slic3r::float_to_string_decimal_point(total_cost, 2));
+            gcode_line.replace(pos, print_time_hour_placeholder.length(), buf);
-        replace_tag(ETags::Total_Wipe_Tower_Cost_Placeholder,
+            processed = true;
-                    Slic3r::float_to_string_decimal_point(m_print->print_statistics().total_wipe_tower_cost, 2));
+            pos = gcode_line.find(print_time_hour_placeholder, pos + strlen(buf));
-        replace_tag(ETags::Total_Wipe_Tower_Filament_Placeholder,
+        }
-                    Slic3r::float_to_string_decimal_point(m_print->print_statistics().total_wipe_tower_filament, 2));
+
+        // Replace print_time_minute
+        pos = gcode_line.find(print_time_minute_placeholder);
+        while (pos != std::string::npos) {
+            char buf[64];
+            sprintf(buf, "%d", print_time_minute);
+            gcode_line.replace(pos, print_time_minute_placeholder.length(), buf);
+            processed = true;
+            pos = gcode_line.find(print_time_minute_placeholder, pos + strlen(buf));
+        }
+
+        // Replace print_time_sec
+        pos = gcode_line.find(print_time_sec_placeholder);
+        while (pos != std::string::npos) {
+            char buf[64];
+            sprintf(buf, "%d", print_time_sec);
+            gcode_line.replace(pos, print_time_sec_placeholder.length(), buf);
+            processed = true;
+            pos = gcode_line.find(print_time_sec_placeholder, pos + strlen(buf));
+        }
+
+        // Replace used_filament_length
+        pos = gcode_line.find(used_filament_placeholder);
+        while (pos != std::string::npos) {
+            double total_filament_mm = 0.0;
+            for (const auto& mm : filament_mm) {
+                total_filament_mm += mm;
+            }
+            double used_filament_length = total_filament_mm / 1000.0; // Convert mm to m
+            char buf[64];
+            sprintf(buf, "%.2f", used_filament_length);
+            gcode_line.replace(pos, used_filament_placeholder.length(), buf);
+            processed = true;
+            pos = gcode_line.find(used_filament_placeholder, pos + strlen(buf));
+        }
 
         return processed;
     };

src/libslic3r/GCode/GCodeProcessor.hpp

@@ -601,12 +601,6 @@ inline constexpr float DEFAULT_FILAMENT_DENSITY = 1.245f;
             Print_Time_Minute_Placeholder,
             Print_Time_Sec_Placeholder,
             Used_Filament_Length_Placeholder,
-            Normal_Print_Time_Placeholder,
-            Silent_Print_Time_Placeholder,
-            Total_Weight_Placeholder,
-            Total_Cost_Placeholder,
-            Total_Wipe_Tower_Cost_Placeholder,
-            Total_Wipe_Tower_Filament_Placeholder,
         };
 
         static const std::string& reserved_tag(ETags tag) { return s_IsBBLPrinter ? Reserved_Tags[static_cast<unsigned char>(tag)] : Reserved_Tags_compatible[static_cast<unsigned char>(tag)]; }

src/libslic3r/PNGReadWrite.cpp

@@ -211,35 +211,6 @@ bool decode_colored_png(const ReadBuf &in_buf, ImageColorscale &out_img)
     return decode_colored_png(stream, out_img);
 }
 
-bool is_decodable_8bit_png(const ReadBuf &pngbuf)
-{
-    static const constexpr int PNG_SIG_BYTES = 8;
-
-    struct ReadBufStream stream{pngbuf};
-    std::vector<png_byte> sig(PNG_SIG_BYTES, 0);
-    stream.read(sig.data(), PNG_SIG_BYTES);
-    if (!png_check_sig(sig.data(), PNG_SIG_BYTES))
-        return false;
-
-    PNGDescr dsc;
-    dsc.png = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-    if (!dsc.png)
-        return false;
-    dsc.info = png_create_info_struct(dsc.png);
-    if (!dsc.info)
-        return false;
-
-    if (!png_read_header_guarded(dsc.png, dsc.info, &stream, PNG_SIG_BYTES))
-        return false;
-
-    const size_t color_type = png_get_color_type(dsc.png, dsc.info);
-    const size_t bit_depth  = png_get_bit_depth(dsc.png, dsc.info);
-    const bool   grey       = color_type == PNG_COLOR_TYPE_GRAY;
-    const bool   colour     = color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_RGB_ALPHA;
-    return png_get_image_width(dsc.png, dsc.info) > 0 && png_get_image_height(dsc.png, dsc.info) > 0 &&
-           bit_depth == 8 && (grey || colour);
-}
-
 
 // Down to earth function to store a packed RGB image to file. Mostly useful for debugging purposes.
 // Based on https://www.lemoda.net/c/write-png/

src/libslic3r/PNGReadWrite.hpp

@@ -50,9 +50,6 @@ struct ReadBuf { const void *buf = nullptr; const size_t sz = 0; };
 
 bool is_png(const ReadBuf &pngbuf);
 
-// True if decode_png() or decode_colored_png() would accept these bytes, judged from the header alone.
-bool is_decodable_8bit_png(const ReadBuf &pngbuf);
-
 struct ReadBufStream: public IStream {
     const ReadBuf &rbuf_ref;
     size_t pos = 0;

src/libslic3r/PerimeterGenerator.cpp

@@ -62,12 +62,7 @@ public:
     // Depth in the hierarchy. External perimeter has depth = 0. An external perimeter could be both a contour and a hole.
     unsigned short                      depth;
     // ORCA: an external hole perimeter touching the next outer wall all around, with nothing between them.
-    // E.g. a 1mm tube wall with 0.5mm walls: 2 lines, the contour's outer wall and the hole's.
     bool                                is_thin_wall_hole = false;
-    // ORCA: an external hole perimeter with no room for an inner wall beside it, at most gap fill. Every thin wall
-    // hole is one, and so is e.g. a 1.5mm tube wall with 0.5mm walls: 3 lines, the two outer walls and gap fill
-    // between them. A 2mm tube wall has room for an inner wall a side and is not. Only set for Inner/Outer/Inner.
-    bool                                is_narrow_wall_hole = false;
     // Children contour, may be both CCW and CW oriented (outer contours or holes).
     std::vector<PerimeterGeneratorLoop> children;
 
@@ -577,8 +572,7 @@ static ExtrusionEntityCollection traverse_extrusions(const PerimeterGenerator& p
                 extrusion_coll.append(std::move(extrusion_loop));
                 // Orca: Reverse the order of paths for thin wall holes. We define thin wall hole as a hole with only one perimeter.
                 const bool thin_wall_hole = !pg_extrusion.is_contour && pg_extrusions.size() == 2;
-                if (thin_wall_hole && perimeter_generator.config->wall_sequence != WallSequence::OuterInner &&
+                if (thin_wall_hole && perimeter_generator.config->wall_sequence != WallSequence::OuterInner)
-                    !perimeter_generator.outer_walls_first_for_brim())
                     std::reverse(extrusion_coll.entities.begin(), extrusion_coll.entities.end());
             }
             else {
@@ -1696,24 +1690,13 @@ void PerimeterGenerator::process_classic()
 
                 last = std::move(offsets);
 
-                // ORCA: a thin wall hole has no room for gap fill or an inner wall anywhere beside its outer wall, a
+                // ORCA: a thin wall hole has no room for gap fill or an inner wall anywhere beside its outer wall.
-                // narrow wall hole none for an inner wall, the room the next loop is offset by below.
                 if (i == 0 && ! holes[0].empty()) {
-                    auto reach = [&last](double room) {
+                    const float    room  = float(0.5 * (ext_perimeter_spacing2 + gap_fill_min_width));
-                        return to_polygons(offset2_ex(last, -float(room), float(room) + float(SCALED_EPSILON)));
+                    const Polygons reach = to_polygons(offset2_ex(last, -room, room + float(SCALED_EPSILON)));
-                    };
+                    for (PerimeterGeneratorLoop &hole : holes[0])
-                    auto out_of_reach = [](const Polygon &hole, const Polygons &reach) {
+                        hole.is_thin_wall_hole = intersection_pl(Polylines{ hole.polygon.split_at_first_point() },
-                        return intersection_pl(Polylines{ hole.split_at_first_point() },
+                            ClipperUtils::clip_clipper_polygons_with_subject_bbox(reach, get_extents(hole.polygon).inflated(SCALED_EPSILON))).empty();
-                            ClipperUtils::clip_clipper_polygons_with_subject_bbox(reach, get_extents(hole).inflated(SCALED_EPSILON))).empty();
-                    };
-                    // Only Inner/Outer/Inner orders narrow wall holes apart.
-                    const bool     narrow_holes_ordered = this->config->wall_sequence == WallSequence::InnerOuterInner;
-                    const Polygons gap_fill_reach       = reach(0.5 * (ext_perimeter_spacing2 + gap_fill_min_width));
-                    const Polygons inner_wall_reach     = narrow_holes_ordered ? reach(ext_perimeter_spacing2 + min_spacing / 2.) : Polygons();
-                    for (PerimeterGeneratorLoop &hole : holes[0]) {
-                        hole.is_thin_wall_hole   = out_of_reach(hole.polygon, gap_fill_reach);
-                        hole.is_narrow_wall_hole = narrow_holes_ordered && out_of_reach(hole.polygon, inner_wall_reach);
-                    }
                 }
 
                 //BBS: refer to superslicer
@@ -1852,16 +1835,18 @@ void PerimeterGenerator::process_classic()
 
             // if brim will be printed, reverse the order of perimeters so that
             // we continue inwards after having finished the brim
+            // TODO: add test for perimeter order
             bool is_outer_wall_first = this->config->wall_sequence == WallSequence::OuterInner;
-            // Orca: a contour with only a narrow wall hole beside it has nothing to sandwich, and prints the hole first,
+            if (is_outer_wall_first ||
-            // then the contour, then the gap fill between them, as Arachne does.
+                //BBS: always print outer wall first when there indeed has brim.
-            const PerimeterGeneratorLoops &island_loops = contours.front();
+                // btLeadingEdgeOnly is an outer brim too (a belt brim at the part's first contact).
-            const bool narrow_wall_hole_island = island_loops.size() == 1 && island_loops.front().children.size() == 1 &&
+                (this->layer_id == 0 &&
-                                                 island_loops.front().children.front().is_narrow_wall_hole;
+                    (this->object_config->brim_type == BrimType::btOuterOnly ||
-            if (is_outer_wall_first || this->outer_walls_first_for_brim())
+                     this->object_config->brim_type == BrimType::btLeadingEdgeOnly) &&
+                    this->object_config->brim_width.value > 0))
                 entities.reverse();
             // Orca: sandwich mode. Apply after 1st layer.
-            else if ((this->config->wall_sequence == WallSequence::InnerOuterInner) && layer_id > 0 && !narrow_wall_hole_island){
+            else if ((this->config->wall_sequence == WallSequence::InnerOuterInner) && layer_id > 0){
                 entities.reverse(); // reverse all entities - order them from external to internal
                 if(entities.entities.size()>2){ // 3 walls minimum needed to do inner outer inner ordering
                     int position = 0; // index to run the re-ordering for multiple external perimeters in a single island.
@@ -2427,25 +2412,11 @@ std::vector<PerimeterGeneratorArachneExtrusion> reorderPerimetersByProximity(std
 
     // Function to reorder perimeters starting from a given reference index
     auto reorderFromReference = [&](int referenceIndex) {
-        // Find first level touching perimeters. The odd centre line of a wall too narrow for two inner walls is shared
+        std::unordered_set<int> firstLevelIndices;
-        // by the outer walls on both sides, so those join this island and are printed before it too, holes first.
+        firstLevelIndices.insert(referenceIndex);
-        std::vector<int> outerIndices{referenceIndex};
+
-        std::vector<int> firstLevelTouchingIndices;
+        // Find first level touching perimeters
-        for (size_t next = 0; next < outerIndices.size(); ++next)
+        std::vector<int> firstLevelTouchingIndices = findAllTouchingPerimeters(entities, firstLevelIndices, threshold_external, threshold_internal, 1);
-            for (int idx : findAllTouchingPerimeters(entities, {outerIndices[next]}, threshold_external, threshold_internal, 1)) {
-                if (std::find(firstLevelTouchingIndices.begin(), firstLevelTouchingIndices.end(), idx) != firstLevelTouchingIndices.end())
-                    continue;
-                firstLevelTouchingIndices.push_back(idx);
-                if (!entities[idx].extrusion->is_odd)
-                    continue;
-                for (size_t i = 0; i < entities.size(); ++i)
-                    if (entities[i].extrusion->inset_idx == 0 && includedIndices.count(int(i)) == 0 &&
-                        std::find(outerIndices.begin(), outerIndices.end(), int(i)) == outerIndices.end() &&
-                        arachne_lines_touch(*entities[i].extrusion, *entities[idx].extrusion, double(threshold_external)))
-                        outerIndices.push_back(int(i));
-            }
-        std::stable_partition(outerIndices.begin(), outerIndices.end(),
-                              [&entities](int idx) { return entities[idx].extrusion->is_closed && !entities[idx].is_contour; });
         // Bring the largest first level perimeter to the front
         // The longest first neighbour is most likely the dominant proximate perimeter
         // hence printing it immediately after the external perimeter should speed things up
@@ -2456,10 +2427,8 @@ std::vector<PerimeterGeneratorArachneExtrusion> reorderPerimetersByProximity(std
             std::iter_swap(maxIt, firstLevelTouchingIndices.end() - 1);
         }
         // Insert first level perimeters into reordered list
-        for (int idx : outerIndices) {
+        reordered.push_back(entities[referenceIndex]);
-            reordered.push_back(entities[idx]);
+        includedIndices.insert(referenceIndex);
-            includedIndices.insert(idx);
-        }
 
         for (int idx : firstLevelTouchingIndices) {
             if (includedIndices.count(idx) == 0) {
@@ -2788,7 +2757,7 @@ void PerimeterGenerator::process_arachne()
         
         if (layer_id == 0){ // disable inner outer inner algorithm after the first layer
         	is_outer_wall_first =
-            	this->config->wall_sequence == WallSequence::OuterInner || this->outer_walls_first_for_brim();
+            	this->config->wall_sequence == WallSequence::OuterInner;
         }
         if (is_outer_wall_first) {
             start_perimeter = 0;
@@ -3073,16 +3042,6 @@ ExPolygons PerimeterGenerator::printable_slices(const ExPolygons &slices) const
     return min_width > EPSILON ? opening_ex(slices, float(scale_(min_width / 2.))) : slices;
 }
 
-bool PerimeterGenerator::outer_walls_first_for_brim() const
-{
-    return layer_id == 0 && brim_puts_outer_walls_first(object_config->brim_type.value, object_config->brim_width.value);
-}
-
-bool brim_puts_outer_walls_first(BrimType brim_type, double brim_width)
-{
-    return brim_width > 0 && (brim_type == btOuterOnly || brim_type == btOuterAndInner || brim_type == btLeadingEdgeOnly);
-}
-
 std::vector<Polygons> PerimeterGenerator::generate_lower_polygons_series(float width)
 {
     float nozzle_diameter = print_config->nozzle_diameter.get_at(config->outer_wall_filament_id - 1);

src/libslic3r/PerimeterGenerator.hpp

@@ -164,8 +164,6 @@ public:
     Polygons    lower_slices_polygons() const { return m_lower_slices_polygons; }
     // ORCA: the slices less the slivers the wall generator prints nothing for, so they never count as support.
     ExPolygons  printable_slices(const ExPolygons &slices) const;
-    // ORCA: whether this layer prints its outer walls first for the brim, see brim_puts_outer_walls_first().
-    bool        outer_walls_first_for_brim() const;
 
 private:
     std::vector<Polygons>     generate_lower_polygons_series(float width);
@@ -185,10 +183,6 @@ private:
     Polygons    m_lower_slices_polygons;
 };
 
-// ORCA: a brim against the outer walls makes the first layer print them first, whatever the wall sequence, so the
-// brim runs straight on into the outer wall. Auto, ear and painted brims may leave the outer walls bare.
-bool brim_puts_outer_walls_first(BrimType brim_type, double brim_width);
-
 }
 
 #endif

src/libslic3r/Preset.cpp

@@ -2293,7 +2293,6 @@ void PresetCollection::load_project_embedded_presets(std::vector<Preset*>& proje
                 BOOST_LOG_TRIVIAL(error) << boost::format("can not find parent for config %1%!")%preset->file;
                 continue;
             }
-            extend_default_config_length(config, false, {});
             preset->config.update_diff_values_to_child_config(config, extruder_id_name, extruder_variant_name, *key_set1, *key_set2);
             //preset->config.apply(std::move(config));
             Preset::normalize(preset->config);

src/libslic3r/Preset.hpp

@@ -756,14 +756,7 @@ public:
     Preset&         get_edited_preset()         { return m_edited_preset; }
     const Preset&   get_edited_preset() const   { return m_edited_preset; }
 
-    // The root of the selected preset's inherits chain, or the selected preset itself when
+    const Preset& get_selected_preset_base() const { return *get_preset_base(m_presets[m_idx_selected]); }
-    // the chain names a preset that is not loaded (e.g. a vendor that is not installed).
-    const Preset& get_selected_preset_base() const
-    {
-        const Preset &selected = m_presets[m_idx_selected];
-        const Preset *base     = get_preset_base(selected);
-        return base ? *base : selected;
-    }
 
     // Return the last saved preset.
 //  const Preset&   get_saved_preset() const { return m_saved_preset; }

src/libslic3r/PrintObject.cpp

@@ -17,7 +17,6 @@
 #include "I18N.hpp"
 #include "Layer.hpp"
 #include "MutablePolygon.hpp"
-#include "PerimeterGenerator.hpp"
 #include "PrintBase.hpp"
 #include "PrintConfig.hpp"
 #include "SLA/IndexedMesh.hpp"
@@ -1465,13 +1464,15 @@ bool PrintObject::invalidate_state_by_config_options(
             || opt_key == "top_surface_speed") {
             // Brim is printed below supports, support invalidates brim and skirt.
             steps.emplace_back(posSupportMaterial);
-            if (opt_key == "brim_type" || opt_key == "brim_width") {
+            if (opt_key == "brim_type") {
-                // Regenerate the walls when the brim starts or stops putting the first layer's outer walls first.
+                const auto* old_brim_type = old_config.option<ConfigOptionEnum<BrimType>>(opt_key);
-                auto outer_walls_first = [](const ConfigOptionResolver &config) {
+                const auto* new_brim_type = new_config.option<ConfigOptionEnum<BrimType>>(opt_key);
-                    return brim_puts_outer_walls_first(config.option<ConfigOptionEnum<BrimType>>("brim_type")->value,
+                //BBS: When switch to manual brim, the object must have brim, then re-generate perimeter
-                                                       config.option<ConfigOptionFloat>("brim_width")->value);
+                //to make the wall order of first layer to be outer-first
-                };
+                // btLeadingEdgeOnly is printed as an outer brim (Brim.cpp, BeltBrim.cpp), so it
-                if (outer_walls_first(old_config) != outer_walls_first(new_config))
+                // takes part in the same first-layer wall order rule.
+                if (old_brim_type->value == btOuterOnly || new_brim_type->value == btOuterOnly ||
+                    old_brim_type->value == btLeadingEdgeOnly || new_brim_type->value == btLeadingEdgeOnly)
                     steps.emplace_back(posPerimeters);
             }
         } else if (

src/libslic3r/Support/SupportCommon.cpp

@@ -707,10 +707,8 @@ void tree_supports_generate_paths(
                                             false);
         }
         if (eec) {
-            if (!eec->empty()) {
+            std::reverse(eec->entities.begin(), eec->entities.end());
-                std::reverse(eec->entities.begin(), eec->entities.end());
+            dst.emplace_back(eec.release());
-                dst.emplace_back(eec.release());
-            }
         }
     }
 }
@@ -1827,7 +1825,12 @@ void generate_support_toolpaths(
                     no_sort = true;
                 } else if (support_params.support_style == SupportMaterialStyle::smsTreeOrganic &&
                            (config.support_base_pattern == smpNone || config.support_base_pattern == smpDefault)) {
-                    tree_supports_generate_paths(base_layer.extrusions, base_layer.polygons_to_extrude(), flow, support_params);
+                    // Orca: A special case for the hollow Organic supports
+                    // Orca: If the tree supports are too tall, use a double wall to make it stronger
+                    SupportParameters support_params2 = support_params;
+                    if (support_layer.print_z > 100.0)
+                        support_params2.tree_branch_diameter_double_wall_area_scaled = 0.1;
+                    tree_supports_generate_paths(base_layer.extrusions, base_layer.polygons_to_extrude(), flow, support_params2);
                     done = true;
                 }
                 if (! done)

src/libslic3r/Support/TreeSupport.cpp

@@ -2149,9 +2149,7 @@ void TreeSupport::draw_circles()
     const bool with_lightning_infill = m_support_params.base_fill_pattern == ipLightning;
     coordf_t support_extrusion_width = m_support_params.support_extrusion_width;
     const float tree_brim_width = config.tree_support_brim_width.value;
-    // Reinforce branches moving more than half a support-line width between layers.
+
-    // Square the threshold for comparison with the squared XY movement below.
-    const double max_move_sq = sqr(double(scale_(m_object_config->support_line_width / 2)));
     // Belt floor: the first object layer is not on a flat bed — it rests on the
     // tilted, moving belt. So the first-object-layer adhesion features (the tree
     // support brim, the hybrid first-layer base expansion) must be suppressed:
@@ -2203,7 +2201,7 @@ void TreeSupport::draw_circles()
                 size_t           first_base_roof_area = 0;
                 bool             floor_interface_as_base = false;
                 bool has_circle_node = false;
-                ExPolygons extra_wall_areas;
+                bool need_extra_wall = false;
                 ExPolygons collision_sharp_tails;
                 ExPolygons collision_base;
                 auto             get_collision = [&](bool sharp_tail) -> ExPolygons             &{
@@ -2281,6 +2279,7 @@ void TreeSupport::draw_circles()
                         // area = diff_clipped({ ExPolygon(circle) }, get_collision(node.is_sharp_tail && node.distance_to_top <= 0));
 
                         if (!area.empty()) has_circle_node = true;
+                        if (node.need_extra_wall) need_extra_wall = true;
 
                         // merge overhang to get a smoother interface surface
                         // Do not merge when buildplate_only is on, because some underneath nodes may have been deleted.
@@ -2295,10 +2294,6 @@ void TreeSupport::draw_circles()
                         }
                     }
 
-                    // Use the Pythagorean theorem to compare movement magnitude (dx² + dy²) without a square root.
-                    if (node.is_processed && node.movement.cast<double>().squaredNorm() > max_move_sq)
-                        append(extra_wall_areas, area);
-
                     if (obj_layer_nr>0 && node.distance_to_top < 0)
                         append(roof_gap_areas, area);
                     else if (obj_layer_nr > 0 && node.support_roof_layers_below == 1 &&
@@ -2535,8 +2530,7 @@ void TreeSupport::draw_circles()
                     //if (area(expoly) < SQ(scale_(1))) continue;
                     area_groups.emplace_back(&expoly, SupportLayer::BaseType, max_layers_above_base);
                     area_groups.back().need_infill = overlaps({ expoly }, area_poly);
-                    area_groups.back().need_extra_wall = !area_groups.back().need_infill &&
+                    area_groups.back().need_extra_wall = need_extra_wall && !area_groups.back().need_infill;
-                        !extra_wall_areas.empty() && overlaps({expoly}, extra_wall_areas);
                 }
                 for (size_t roof_idx = 0; roof_idx < ts_layer->roof_areas.size(); ++roof_idx) {
                     auto &expoly = ts_layer->roof_areas[roof_idx];
@@ -3439,6 +3433,11 @@ void TreeSupport::smooth_nodes()
         }
     }
     
+    float max_move = scale_(m_object_config->support_line_width / 2);
+    // if the branch is very tall, the tip also needs extra wall
+    float thresh_tall_branch = 100;
+    float thresh_dist_to_top = 30;
+
     for (int layer_nr = 0; layer_nr< contact_nodes.size(); layer_nr++) {
         std::vector<SupportNode *> &curr_layer_nodes = contact_nodes[layer_nr];
         if (curr_layer_nodes.empty()) continue;
@@ -3448,17 +3447,20 @@ void TreeSupport::smooth_nodes()
                 std::vector<double> radii;
                 std::vector<SupportNode *>   branch;
                 SupportNode *              p_node = node;
+                float                        total_height = 0;
                 // add a fixed head if it's not a polygon node, see STUDIO-4403
                 // Polygon node can't be added because the move distance might be huge, making the nodes in between jump and dangling
                 if (node->child && node->child->type!=ePolygon) {
                     pts.push_back(p_node->child->position);
                     radii.push_back(p_node->child->radius);
                     branch.push_back(p_node->child);
+                    total_height += p_node->child->height;
                 }
                 do {
                     pts.push_back(p_node->position);
                     radii.push_back(p_node->radius);
                     branch.push_back(p_node);
+                    total_height += p_node->height;
                     p_node = p_node->parent;
                 } while (p_node && !p_node->is_processed);
                 if (pts.size() < 3) continue;
@@ -3477,6 +3479,9 @@ void TreeSupport::smooth_nodes()
                             branch[i]->radius = radii1[i];
                             branch[i]->movement = (pts[i + 1] - pts[i - 1]) / 2;
                             branch[i]->is_processed = true;
+                            if (branch[i]->parents.size() > 1 || (branch[i]->movement.x() > max_move || branch[i]->movement.y() > max_move) ||
+                                (total_height > thresh_tall_branch && branch[i]->dist_mm_to_top < thresh_dist_to_top))
+                                branch[i]->need_extra_wall = true;
                             BOOST_LOG_TRIVIAL(info) << "smooth_nodes: layer_nr=" << layer_nr << ", i=" << i << ", pt=" << pt << ", movement=" << branch[i]->movement << ", radius=" << branch[i]->radius;
                         }
                     }
@@ -3484,6 +3489,13 @@ void TreeSupport::smooth_nodes()
                         std::swap(pts, pts1);
                         std::swap(radii, radii1);
                     }
+                    else {
+                        // interpolate need_extra_wall in the end
+                        for (size_t i = 1; i < branch.size() - 1; i++) {
+                            if (branch[i - 1]->need_extra_wall && branch[i + 1]->need_extra_wall)
+                                branch[i]->need_extra_wall = true;
+                        }
+                    }
                 }
             }
         }

src/libslic3r/Support/TreeSupport.hpp

@@ -135,6 +135,7 @@ struct SupportNode
     TreeNodeType   type            = eCircle;
     bool           is_corner       = false;
     bool           is_processed    = false;
+    bool           need_extra_wall = false;
     bool           is_sharp_tail   = false;
     bool           valid = true;
     ExPolygon      overhang; // when type==ePolygon, set this value to get original overhang area

src/libslic3r/TextureDisplacement.cpp

@@ -283,7 +283,7 @@ bool height_texture_has_color(const TextureDisplacementLayer &layer)
     return decode_height_texture(layer).has_color();
 }
 
-DecodedHeightTexture decode_height_texture(const TextureDisplacementLayer &layer, bool keep_decoded)
+DecodedHeightTexture decode_height_texture(const TextureDisplacementLayer &layer)
 {
     DecodedHeightTexture result;
     if (layer.empty())
@@ -351,15 +351,13 @@ DecodedHeightTexture decode_height_texture(const TextureDisplacementLayer &layer
                 }
         }
 
-        if (keep_decoded) {
+        std::lock_guard<std::mutex> lock(g_decoded_texture_cache.mutex);
-            std::lock_guard<std::mutex> lock(g_decoded_texture_cache.mutex);
+        // Opportunistically drop entries for image_data that no longer exists anywhere, so the
-            // Opportunistically drop entries for image_data that no longer exists anywhere, so the
+        // cache doesn't grow without bound across many add/remove-texture cycles in a long session.
-            // cache doesn't grow without bound across many add/remove-texture cycles in a long session.
+        auto &entries = g_decoded_texture_cache.entries;
-            auto &entries = g_decoded_texture_cache.entries;
+        for (auto it = entries.begin(); it != entries.end();)
-            for (auto it = entries.begin(); it != entries.end();)
+            it = it->second.first.expired() ? entries.erase(it) : std::next(it);
-                it = it->second.first.expired() ? entries.erase(it) : std::next(it);
+        entries[key] = { std::weak_ptr<const std::vector<unsigned char>>(layer.image_data), result };
-            entries[key] = { std::weak_ptr<const std::vector<unsigned char>>(layer.image_data), result };
-        }
     }
 
     // The image-adjustment panel's live edits, on top of the decode and before the smoothing. Before,

src/libslic3r/TextureDisplacement.hpp

@@ -599,9 +599,8 @@ DecodedHeightTexture downscale_height_texture(const DecodedHeightTexture &src, i
 // colour PNGs are accepted; for a colour source the height is its luminance, using the same
 // coefficients wxImage::ConvertToGreyscale() uses, so a texture imported as colour displaces exactly
 // as it did when the importer flattened it to grey on the way in. Returns an empty
-// DecodedHeightTexture if image_data is empty or is not a PNG at all. keep_decoded = false leaves the
+// DecodedHeightTexture if image_data is empty or is not a PNG at all.
-// result out of the decode cache, for one-off reads such as a picker thumbnail that must not hold full-size pixels.
+DecodedHeightTexture decode_height_texture(const TextureDisplacementLayer &layer);
-DecodedHeightTexture decode_height_texture(const TextureDisplacementLayer &layer, bool keep_decoded = true);
 
 // decode_height_texture(layer).has_color(), answered from the decode cache rather than from a copy of the
 // texture - cheap enough to ask every frame. Smoothing does not change it, so the raw decode is what is read.

src/libslic3r/Utils.hpp

@@ -842,13 +842,6 @@ void load_string_file(const boost::filesystem::path& p, std::string& str);
 
 bool check_layer_id_pattern(const std::string& pattern, int layer_id);
 
-// On Windows, return an equivalent path carrying the extended-length ("\\?\" / "\\?\UNC\")
-// prefix so the Win32 APIs accept it past MAX_PATH even when LongPathsEnabled is off. The path
-// is made absolute and lexically normalized first, because the prefix disables normalisation.
-// A path that is already extended (or a device path) is returned unchanged; on other platforms,
-// or when an absolute path cannot be formed, the input is returned unchanged.
-boost::filesystem::path extended_path(const boost::filesystem::path& path);
-
 } // namespace Slic3r
 
 #if WIN32

src/libslic3r/miniz_extension.cpp

@@ -17,7 +17,6 @@
 
 #if defined(_MSC_VER) || defined(__MINGW64__)
 #include "boost/nowide/cstdio.hpp"
-#include "boost/nowide/convert.hpp"
 #endif
 
 #include "I18N.hpp"
@@ -63,11 +62,7 @@ bool open_zip(mz_zip_archive *zip, const char *fname, bool isread)
 
     FILE *f = nullptr;
 #if defined(_MSC_VER) || defined(__MINGW64__)
-    // fname is UTF-8 (the nowide contract). Route it through the shared extended-path helper so an
+    f = boost::nowide::fopen(fname, mode);
-    // archive stored past MAX_PATH opens even with LongPathsEnabled off.
-    const std::wstring wide_path = boost::nowide::widen(fname);
-    const std::string  extended  = boost::nowide::narrow(Slic3r::extended_path(boost::filesystem::path(wide_path)).wstring());
-    f = boost::nowide::fopen(extended.c_str(), mode);
 #elif defined(__GNUC__) && defined(_LARGEFILE64_SOURCE)
     f = fopen64(fname, mode);
 #else
@@ -106,14 +101,6 @@ bool close_zip(mz_zip_archive *zip, bool isread)
     }
     return ret;
 }
-
-#ifdef WIN32
-// mz_file_write_func writing an extracted entry into an already-open FILE*.
-size_t mz_write_to_cfile(void *opaque, mz_uint64 /*file_ofs*/, const void *buffer, size_t size)
-{
-    return std::fwrite(buffer, 1, size, static_cast<FILE *>(opaque));
-}
-#endif
 }
 
 bool open_zip_reader(mz_zip_archive *zip, const std::string &fname)
@@ -129,36 +116,6 @@ bool open_zip_writer(mz_zip_archive *zip, const std::string &fname)
 bool close_zip_reader(mz_zip_archive *zip) { return close_zip(zip, true); }
 bool close_zip_writer(mz_zip_archive *zip) { return close_zip(zip, false); }
 
-bool extract_zip_entry_to_file(mz_zip_archive *zip, mz_uint file_index, const boost::filesystem::path &dest_path)
-{
-    if (!zip)
-        return false;
-#ifdef WIN32
-    // Open the destination ourselves with a Windows extended-length path: miniz's narrow
-    // extract_to_file cannot be relied on past MAX_PATH with LongPathsEnabled off, and its wide
-    // variant takes a plain (unprefixed) path and a text-mode stream. This keeps the write binary.
-    FILE *file = ::_wfopen(Slic3r::extended_path(dest_path).wstring().c_str(), L"wb");
-    if (!file) {
-        zip->m_last_error = MZ_ZIP_FILE_OPEN_FAILED;
-        return false;
-    }
-
-    const bool written = mz_zip_reader_extract_to_callback(zip, file_index, mz_write_to_cfile, file, 0) != 0;
-    const bool closed  = std::fclose(file) == 0;
-    if (!written || !closed) {
-        if (written && !closed)
-            zip->m_last_error = MZ_ZIP_FILE_CLOSE_FAILED;
-        // Drop the partial entry rather than leave a truncated file behind.
-        boost::system::error_code ec;
-        boost::filesystem::remove(Slic3r::extended_path(dest_path), ec);
-        return false;
-    }
-    return true;
-#else
-    return mz_zip_reader_extract_to_file(zip, file_index, dest_path.string().c_str(), 0) != 0;
-#endif
-}
-
 std::string decode_archive_entry_path(mz_zip_archive *zip, const mz_zip_archive_file_stat &stat)
 {
     if (stat.m_is_utf8)
@@ -199,13 +156,10 @@ bool extract_archive_confined(const std::string &zip_path_utf8, const std::strin
         }
         const std::string dest_file = dest_dir + "/" + stat.m_filename;
         try {
-            // Use the extended-length form for every filesystem call so entries under a destination
-            // past MAX_PATH are created even with LongPathsEnabled off.
-            const boost::filesystem::path dest_path(dest_file);
-            const boost::filesystem::path io_dest = extended_path(dest_path);
             if (stat.m_is_directory) {
-                if (!boost::filesystem::exists(io_dest))
+                const boost::filesystem::path dest_path(dest_file);
-                    boost::filesystem::create_directories(io_dest);
+                if (!boost::filesystem::exists(dest_path))
+                    boost::filesystem::create_directories(dest_path);
                 continue;
             }
             if (stat.m_uncomp_size == 0) {
@@ -213,9 +167,10 @@ bool extract_archive_confined(const std::string &zip_path_utf8, const std::strin
                 continue;
             }
             // Replace a symlink at the destination rather than writing through it.
-            if (boost::filesystem::is_symlink(boost::filesystem::symlink_status(io_dest)))
+            const boost::filesystem::path dest_path(dest_file);
-                boost::filesystem::remove(io_dest);
+            if (boost::filesystem::is_symlink(boost::filesystem::symlink_status(dest_path)))
-            if (!extract_zip_entry_to_file(&archive, stat.m_file_index, dest_path)) {
+                boost::filesystem::remove(dest_path);
+            if (!mz_zip_reader_extract_to_file(&archive, stat.m_file_index, dest_file.c_str(), 0)) {
                 BOOST_LOG_TRIVIAL(error) << "Unzip: extract file " << stat.m_filename << " to dest " << dest_file << " failed";
                 close_zip_reader(&archive);
                 return false;

src/libslic3r/miniz_extension.hpp

@@ -1,7 +1,6 @@
 #ifndef MINIZ_EXTENSION_HPP
 #define MINIZ_EXTENSION_HPP
 
-#include <boost/filesystem/path.hpp>
 #include <string>
 #include <miniz.h>
 
@@ -14,10 +13,6 @@ bool close_zip_writer(mz_zip_archive *zip);
 std::string decode_archive_entry_path(mz_zip_archive *zip, const mz_zip_archive_file_stat &stat);
 // Extracts every entry of the archive under dest_dir. Nothing is written if any entry would resolve outside dest_dir.
 bool extract_archive_confined(const std::string &zip_path_utf8, const std::string &dest_dir);
-// Extracts one entry into dest_path, binary-safe and overwriting. On Windows the destination is
-// opened through an extended-length path so it works past MAX_PATH even with LongPathsEnabled off;
-// a partial file is removed if the write fails. False for a directory/unsupported entry or on error.
-bool extract_zip_entry_to_file(mz_zip_archive *zip, mz_uint file_index, const boost::filesystem::path &dest_path);
 
 class MZ_Archive {
 public:

src/libslic3r/utils.cpp

@@ -2254,45 +2254,5 @@ bool check_layer_id_pattern(const std::string& pattern, int layer_id){
     return mod >= 0 && mod < count;
 }
 
-boost::filesystem::path extended_path(const boost::filesystem::path& path) {
-#ifdef WIN32
-    namespace fs = boost::filesystem;
-
-    // Already extended, or an explicit device path (which is not subject to MAX_PATH and must not
-    // be absolutized or normalized): leave it alone.
-    {
-        fs::path prefix_candidate = path;
-        const std::wstring native = prefix_candidate.make_preferred().wstring();
-        if (native.rfind(L"\\\\?\\", 0) == 0 || native.rfind(L"\\\\.\\", 0) == 0)
-            return fs::path(native);
-    }
-
-    fs::path absolute = path;
-    if (!absolute.is_absolute()) {
-        boost::system::error_code ec;
-        absolute = fs::absolute(absolute, ec);
-        if (ec)
-            return path; // can't form a valid prefixed path from a relative one
-    }
-
-    // A trailing separator is redundant to the Win32 APIs, but lexically_normal() would rewrite it
-    // as a "." element, which the "\\?\" prefix (normalisation off) takes literally. Drop it first.
-    while (absolute.has_relative_path() && absolute.filename() == ".")
-        absolute = absolute.parent_path();
-
-    // The "\\?\" prefix turns off Win32 normalisation, so do it here first.
-    absolute = absolute.lexically_normal();
-
-    // Extended paths only recognize backslash separators.
-    const std::wstring native = absolute.make_preferred().wstring();
-    if (native.empty())
-        return path;
-    if (native.rfind(L"\\\\", 0) == 0)
-        return fs::path(L"\\\\?\\UNC\\" + native.substr(2)); // \\server\share\... -> \\?\UNC\server\share\...
-    return fs::path(L"\\\\?\\" + native);                    // C:\dir\... -> \\?\C:\dir\...
-#else
-    return path;
-#endif
-}
 
 }; // namespace Slic3r

src/libvgcode/src/Layers.cpp

@@ -75,7 +75,7 @@ std::vector<float> Layers::get_zs() const
 
 size_t Layers::get_layer_id_at(float z) const
 {
-    auto iter = std::upper_bound(m_items.begin(), m_items.end(), z, [](float z, const Item& item) { return item.z > z; });
+    auto iter = std::upper_bound(m_items.begin(), m_items.end(), z, [](float z, const Item& item) { return item.z < z; });
     return std::distance(m_items.begin(), iter);
 }
 

src/slic3r/GUI/CreatePresetsDialog.cpp

@@ -3151,7 +3151,7 @@ void CreatePrinterPresetDialog::set_current_visible_printer()
     m_printer_name_to_preset.clear();
     for (const Preset &printer_preset : printer_presets) {
         if (!printer_preset.is_visible) continue;
-        if (preset_bundle->printers.get_preset_base(printer_preset) != &printer_preset) continue;
+        if (preset_bundle->printers.get_preset_base(printer_preset)->name != printer_preset.name) continue;
         if (auto printer_model = dynamic_cast<ConfigOptionString*>(const_cast<Preset&>(printer_preset).config.option("printer_model", false))) {
             if (m_printer_name_to_preset.find(printer_model->value) == m_printer_name_to_preset.end()) {
                 printer_choice.push_back(from_u8(printer_model->value));
@@ -4962,7 +4962,7 @@ void CreatePresetForPrinterDialog::get_visible_printer_and_compatible_filament_p
                     if (filament_preset.is_default || !filament_preset.is_compatible || filament_preset.is_project_embedded) continue;
                     ConfigOptionStrings *filament_types;
                     const Preset *       filament_preset_base = m_preset_bundle->filaments.get_preset_base(filament_preset);
-                    if (filament_preset_base == &filament_preset || filament_preset_base == nullptr) {
+                    if (filament_preset_base == &filament_preset) {
                         filament_types = dynamic_cast<ConfigOptionStrings *>(const_cast<Preset *>(&filament_preset)->config.option("filament_type"));
                     } else {
                         filament_types = dynamic_cast<ConfigOptionStrings *>(const_cast<Preset *>(filament_preset_base)->config.option("filament_type"));

src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp

@@ -174,10 +174,6 @@ constexpr int HEIGHT_TEX_MAX_PX = 2048;
 // The full-size image is only ever adjusted once, on commit.
 constexpr int ADJUST_PREVIEW_MAX_PX = 384;
 
-// Library textures the texture picker decodes per frame. Each decode runs on the GUI thread, so the
-// rest of the visible tiles fill in over the following frames instead of in one stall.
-constexpr int PICKER_LOADS_PER_FRAME = 2;
-
 // How many rings of vertex-adjacent triangles either side of the paint's edge join the border refine
 // band (see collect_paint_region()). Two is enough to grade the size change without the band's own
 // cost growing to matter: it is a ring around a perimeter, not an area.
@@ -4122,7 +4118,7 @@ const GLGizmoTextureDisplacement::LibraryTexture *GLGizmoTextureDisplacement::ge
     if (entry.image_data) {
         TextureDisplacementLayer probe;
         probe.image_data = entry.image_data;
-        entry.thumbnail  = upload_height_thumbnail(decode_height_texture(probe, /* keep_decoded */ false));
+        entry.thumbnail  = upload_height_thumbnail(decode_height_texture(probe));
         if (!entry.thumbnail)
             entry.image_data.reset(); // decoded to nothing usable - treat it as a failed load
     } else {
@@ -4335,8 +4331,6 @@ void GLGizmoTextureDisplacement::render_texture_library_popup(const ImVec2 &pane
     std::optional<TextureLibraryEntry> to_remove;
     bool                               import_clicked = false;
     bool                               download_clicked = false;
-    int                                loads_left       = PICKER_LOADS_PER_FRAME;
-    bool                               loads_deferred   = false;
 
     // Tiles are placed on the four-column grid explicitly rather than flowed with SameLine(): a user tile
     // overlays a remove button on its corner, and that button would otherwise be "the previous item" the
@@ -4354,30 +4348,11 @@ void GLGizmoTextureDisplacement::render_texture_library_popup(const ImVec2 &pane
     };
     // One section's tiles, in the order the section holds them (shipped alphabetically, pack textures by
     // name, the user's own most recently used first - the order texture_library() produced); a user tile
-    // carries a remove button on hover. Returns how many tiles it laid out, drawn or not.
+    // carries a remove button on hover. Returns how many it drew.
     const auto grid = [&](const ImVec2 &origin, const std::vector<const TextureLibraryEntry *> &entries, bool removable) {
         int n = 0;
         for (const TextureLibraryEntry *entry : entries) {
-            const ImVec2 rect_min = tile_pos(origin, n++);
+            ImGui::SetCursorScreenPos(tile_pos(origin, n++));
-            const ImVec2 rect_max = ImVec2(rect_min.x + tile, rect_min.y + tile);
-            const bool   current  = entry->path == layer->path;
-            // The selected tile is centred even when it is off screen, so it is drawn and loaded next frame.
-            if (current && m_picker_reveal_selected) {
-                ImGui::SetScrollFromPosY(0.5f * (rect_min.y + rect_max.y) - ImGui::GetWindowPos().y, 0.5f);
-                m_parent.request_extra_frame();
-            }
-            if (!ImGui::IsRectVisible(rect_min, rect_max))
-                continue;
-            // Thumbnails decode on this thread, so only a few per frame; the rest fill in on later frames.
-            const bool cached = m_library_textures.count(entry->path) != 0;
-            if (!cached && loads_left == 0) {
-                loads_deferred = true;
-                dl->AddRectFilled(rect_min, rect_max, ImGui::GetColorU32(ImGuiCol_FrameBg), style.FrameRounding);
-                continue;
-            }
-            if (!cached)
-                --loads_left;
-            ImGui::SetCursorScreenPos(rect_min);
             ImGui::PushID(entry->path.c_str());
             const LibraryTexture *tex     = get_library_texture(entry->path);
             GLTexture            *thumb   = tex != nullptr ? tex->thumbnail.get() : nullptr;
@@ -4400,6 +4375,7 @@ void GLGizmoTextureDisplacement::render_texture_library_popup(const ImVec2 &pane
             if (removable)
                 ImGui::SetItemAllowOverlap(); // the remove button drawn over its corner takes its own clicks
             const ImVec2 a       = ImGui::GetItemRectMin(), b = ImGui::GetItemRectMax();
+            const bool   current = entry->path == layer->path;
             const bool   hovered = ImGui::IsItemHovered();
             // The layer's current texture carries an accent ring, and the tile under the pointer a thinner,
             // fainter one. Both are drawn inside the tile, where the grid's clip rect never cuts them.
@@ -4408,6 +4384,9 @@ void GLGizmoTextureDisplacement::render_texture_library_popup(const ImVec2 &pane
                 dl->AddRect(ImVec2(a.x + 0.5f * w, a.y + 0.5f * w), ImVec2(b.x - 0.5f * w, b.y - 0.5f * w),
                             ImGui::GetColorU32(current ? orca : ImVec4(orca.x, orca.y, orca.z, 0.6f)), 0.f, 0, w);
             }
+            // Centred, as far as the scroll range allows, so the textures around it are in view too.
+            if (current && m_picker_reveal_selected)
+                ImGui::SetScrollFromPosY(0.5f * (a.y + b.y) - ImGui::GetWindowPos().y, 0.5f);
             if (hovered)
                 panel_tooltip(entry->name);
 
@@ -4596,8 +4575,6 @@ void GLGizmoTextureDisplacement::render_texture_library_popup(const ImVec2 &pane
         ImGui::TextDisabled("%s", _u8L("PNG, JPG or BMP - converted to a height map on import. Hover one of yours to remove it.").c_str());
         ImGui::PopTextWrapPos();
     }
-    if (loads_deferred)
-        m_parent.request_extra_frame();
     // Done whether or not the current texture was drawn: one in a collapsed section stays where it is.
     m_picker_reveal_selected = false;
     ImGui::EndChild();

src/slic3r/GUI/ImGuiWrapper.cpp

@@ -62,7 +62,6 @@
 #include "Search.hpp"
 #include "BitmapCache.hpp"
 #include "GUI_App.hpp"
-#include "KeyChord.hpp"
 
 #include <nanosvg/nanosvg.h>
 #include <nanosvg/nanosvgrast.h>
@@ -2135,27 +2134,6 @@ bool ImGuiWrapper::want_any_input() const
     return io.WantCaptureMouse || io.WantCaptureKeyboard || io.WantTextInput;
 }
 
-bool ImGuiWrapper::text_input_active() const
-{
-    const ImGuiID id = ImGui::GetActiveID();
-    return id != 0 && ImGui::GetInputTextState(id) != nullptr;
-}
-
-bool ImGuiWrapper::modal_popup_open() const
-{
-    // A modal stays on the popup stack while its canvas is hidden, so it counts only if the last finished
-    // frame drew it, which NewFrame() moves from Active to WasActive.
-    const ImGuiWindow* modal = ImGui::GetTopMostPopupModal();
-    if (modal == nullptr)
-        return false;
-    return ImGui::GetCurrentContext()->WithinFrameScope ? modal->WasActive : modal->Active;
-}
-
-bool ImGuiWrapper::owns_key(const KeyChord& chord) const
-{
-    return modal_popup_open() || (chord.edits_text() && text_input_active());
-}
-
 ImFontAtlasCustomRect* ImGuiWrapper::GetTextureCustomRect(const wchar_t& tex_id)
 {
     auto item = m_custom_glyph_rects_ids.find(tex_id);

src/slic3r/GUI/ImGuiWrapper.hpp

@@ -35,7 +35,6 @@ struct ImRect;
 namespace Slic3r {
 namespace GUI {
 
-struct KeyChord;
 
 bool get_data_from_svg(const std::string &filename, unsigned int max_size_px, ThumbnailData &thumbnail_data);
 
@@ -220,12 +219,6 @@ public:
     bool want_keyboard() const;
     bool want_text_input() const;
     bool want_any_input() const;
-    // True while an ImGui InputText is active, without the one-frame lag of want_text_input().
-    bool text_input_active() const;
-    // True while an ImGui modal popup is on screen.
-    bool modal_popup_open() const;
-    // True for every key while a modal is open, and for text-editing keys while an InputText is active.
-    bool owns_key(const KeyChord& chord) const;
 
     // Optional inputs are used for set up value inside of an optional, with default value
     // 

src/slic3r/GUI/Jobs/PrintJob.cpp

@@ -716,6 +716,8 @@ void PrintJob::process(Ctl &ctl)
     } else {
         // wait for printer mqtt ready the same job id
 
+        wxGetApp().plater()->record_slice_preset("print");
+
         BOOST_LOG_TRIVIAL(error) << "print_job: send ok.";
         wxCommandEvent* evt = new wxCommandEvent(m_print_job_completed_id);
         if (!m_completed_evt_data.empty())

src/slic3r/GUI/KBShortcutsDialog.cpp

@@ -173,7 +173,7 @@ void KBShortcutsDialog::fill_pages()
     using Section              = ShortcutSection;
 
     if (wxGetApp().is_editor()) {
-        page(_L("Global"), _L("Available anywhere in the window."), ShortcutContext::Global, {
+        page(_L("Global"), _L("Available anywhere in the window, even while typing in a text field."), ShortcutContext::Global, {
             fixed(Section::SpeedDial, { alt, "1-9, 0" }, L("Run favorite 1 to 10")),
             fixed(Section::SpeedDial, { ctrl, "B" }, L("Pin or unpin the selected action")),
             // wx cycles notebook pages on Ctrl+Tab, which is Cmd+Tab on macOS and never arrives there.
@@ -438,16 +438,17 @@ ShortcutCaptureDialog::ShortcutCaptureDialog(wxWindow* parent, Shortcut shortcut
     SetBackgroundColour(*wxWHITE);
     wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
 
-    // A Global shortcut runs before the focused control gets the key, so its hint names the keys it can use.
+    // A Global shortcut also runs while a text field has the focus, so its hint names the keys it can use.
     const bool     global = (shortcut_info(shortcut).contexts & context_bit(ShortcutContext::Global)) != 0;
     const wxString advice = global_key_advice();
+    const wxString typing = _L("Global shortcuts also apply while typing.");
     const wxString rule   = _L("A key that types a character cannot be a global shortcut.");
-    m_hint      = global ? advice : _L("Esc cancels, Enter confirms.");
+    m_hint      = global ? typing + "\n" + advice : _L("Esc cancels, Enter confirms.");
     m_rejection = rule + "\n" + advice;
 
     // Wide enough for each sentence on a line of its own where the translation allows, within limits.
     int width = FromDIP(450);
-    for (const wxString& sentence : { rule, advice }) {
+    for (const wxString& sentence : { typing, rule, advice }) {
         int extent = 0;
         GetTextExtent(sentence, &extent, nullptr, nullptr, nullptr, &wxGetApp().normal_font());
         width = std::max(width, extent);

src/slic3r/GUI/KeyChord.cpp

@@ -187,40 +187,6 @@ bool KeyChord::is_menu_accelerator() const
     return valid() && ((modifiers & (wxMOD_CONTROL | wxMOD_ALT | wxMOD_RAW_CONTROL)) != 0 || (!is_printable(key) && key != WXK_SPACE));
 }
 
-bool KeyChord::edits_text() const
-{
-    if (!valid())
-        return false;
-    if (!is_menu_accelerator())
-        return true;
-    const int mods = modifiers & ~wxMOD_SHIFT;
-    switch (key) {
-    case WXK_LEFT: case WXK_RIGHT: case WXK_UP: case WXK_DOWN:
-    case WXK_HOME: case WXK_END: case WXK_BACK: case WXK_DELETE:
-#ifdef __APPLE__
-        return mods == wxMOD_NONE || mods == wxMOD_CONTROL || mods == wxMOD_ALT; // Option moves by word
-#else
-        return mods == wxMOD_NONE || mods == wxMOD_CONTROL;
-#endif
-    case WXK_INSERT:
-        return mods == wxMOD_NONE || mods == wxMOD_CONTROL;
-    case WXK_RETURN: case WXK_TAB: case WXK_ESCAPE: case WXK_PAGEUP: case WXK_PAGEDOWN:
-        return mods == wxMOD_NONE;
-    default:
-        break;
-    }
-    if (!is_printable(key))
-        return false;
-#ifdef __APPLE__
-    if (mods == wxMOD_ALT || mods == wxMOD_RAW_CONTROL)
-        return true; // Option types a character, Control runs the Cocoa text key bindings
-#else
-    if (mods == (wxMOD_CONTROL | wxMOD_ALT))
-        return true; // AltGr types a character
-#endif
-    return mods == wxMOD_CONTROL && (key == 'A' || key == 'C' || key == 'V' || key == 'X' || key == 'Y' || key == 'Z');
-}
-
 // Only a chord the desktop acts on while still delivering it to the app belongs here.
 bool KeyChord::is_system_shortcut() const
 {

src/slic3r/GUI/KeyChord.hpp

@@ -35,9 +35,6 @@ struct KeyChord
     // True when Ctrl or Alt is held or the key is non-printable, the chords a menu can own without
     // swallowing typing in text fields.
     bool is_menu_accelerator() const;
-    // True for a chord a focused text field acts on: typing a character (AltGr and macOS Option
-    // characters included), moving the caret, selecting, deleting, or the clipboard and undo chords.
-    bool edits_text() const;
     // True for a chord the desktop acts on although the app receives it, so a binding would
     // take it from the system.
     bool is_system_shortcut() const;

src/slic3r/GUI/MainFrame.cpp

@@ -50,7 +50,6 @@
 #include <wx/panel.h>
 #include <wx/settings.h>
 #include <wx/textentry.h>
-#include <wx/spinctrl.h>
 #include <wx/notebook.h>
 #include <wx/listbook.h>
 #include <wx/simplebook.h>
@@ -108,8 +107,6 @@
 #include "../Utils/PrintHost.hpp"
 
 #include "GUI_App.hpp"
-#include "ImGuiWrapper.hpp"
-#include "OpenGLManager.hpp"
 #include "Shortcuts.hpp"
 #include "UnsavedChangesDialog.hpp"
 #include "PublishSettingsDialog.hpp"
@@ -187,31 +184,18 @@ enum class ERescaleTarget
 
 namespace {
 
-bool focus_is_text_field(wxWindow* focus)
-{
-    if (dynamic_cast<wxTextEntryBase*>(focus) || dynamic_cast<wxWebView*>(focus))
-        return true; // a web page can have its own text fields
-    if (dynamic_cast<wxSpinCtrl*>(focus) || dynamic_cast<wxSpinCtrlDouble*>(focus))
-        return true; // the native Windows spin control is not a wxTextEntry
-    return false;
-}
-
-// Only a scene canvas draws ImGui, and a hidden one can keep the wx focus after a tab switch.
-const ImGuiWrapper* focused_canvas_imgui(wxWindow* focus)
-{
-    if (!OpenGLManager::is_scene_canvas(focus) || !focus->IsShownOnScreen())
-        return nullptr;
-    return wxGetApp().imgui();
-}
-
 // Space opens the speed dial, but it is the activation key for buttons, checkboxes and other
-// controls, so only take Space when the focused window has no keyboard-activation meaning of its
+// controls. CHAR_HOOK runs before the focused child, so only take Space when the focused window has
-// own. Canvases (GLCanvas3D) and panels are not controls and fall through to "open"; the Notebook
+// no keyboard-activation meaning of its own. Canvases (GLCanvas3D) and panels are not controls and
-// itself does too, so Space still opens the dial on any page.
+// fall through to "open"; the Notebook itself does too, so Space still opens the dial on any page.
 bool focus_keeps_space(wxWindow* focus)
 {
     if (!focus)
         return false;
+    if (dynamic_cast<wxTextEntryBase*>(focus))
+        return true; // typing a space into a text field
+    if (dynamic_cast<wxWebView*>(focus))
+        return true; // web content scrolls and hosts its own text fields
     if (dynamic_cast<::Button*>(focus))
         return true; // custom button: Space clicks it (it is a wxWindow, not a wxControl)
     if (dynamic_cast<StaticBox*>(focus))
@@ -832,12 +816,16 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
 
 bool MainFrame::handle_global_shortcut(const KeyChord& chord)
 {
-    // CHAR_HOOK runs before the focused window, so leave text-editing keys to a focused text field and
+    // ImGui draws its text fields (the text tool's box, a sketch value field) on the GL canvas, so
-    // the keys ImGui owns to the focused canvas.
+    // while one of them is typed into the focused wx window is that canvas or an in-canvas frame:
+    // neither is a wxControl, so focus_keeps_space() cannot see it and CHAR_HOOK takes the chord
+    // here first -- Space opened the Speed Dial, Ctrl+P the Preferences, and the field never saw
+    // the key. ImGui raises WantCaptureKeyboard while one of its items owns the keyboard, so leave
+    // the key to it then. A focused wxControl (text field, list, web view) is untouched: those
+    // keep their own keys, and ImGui's flag can outlive the focus moving to one of them.
     wxWindow* const focus = wxWindow::FindFocus();
-    if (chord.edits_text() && focus_is_text_field(focus))
+    ImGuiWrapper* const imgui = wxGetApp().imgui();
-        return false;
+    if (focus != nullptr && imgui != nullptr && imgui->want_keyboard() && dynamic_cast<wxControl*>(focus) == nullptr)
-    if (const ImGuiWrapper* imgui = focused_canvas_imgui(focus); imgui != nullptr && imgui->owns_key(chord))
         return false;
 
     const std::optional<Shortcut> shortcut = wxGetApp().shortcuts().lookup(ShortcutContext::Global, chord);

src/slic3r/GUI/OpenGLManager.cpp

@@ -427,8 +427,6 @@ wxGLContext* OpenGLManager::init_glcontext(wxGLCanvas& canvas, const std::pair<i
     return m_context;
 }
 
-static const char* const SCENE_CANVAS_NAME = "OrcaSceneCanvas";
-
 wxGLCanvas* OpenGLManager::create_wxglcanvas(wxWindow& parent)
 {
     int antialiasing_samples = 4;
@@ -472,17 +470,12 @@ wxGLCanvas* OpenGLManager::create_wxglcanvas(wxWindow& parent)
         attribList[samples_value_idx] = 0;
     }
 
-    wxGLCanvas* canvas = new wxGLCanvas(&parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS, SCENE_CANVAS_NAME);
+    wxGLCanvas* canvas = new wxGLCanvas(&parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize, wxWANTS_CHARS);
     // The GL canvas paints its entire surface, so background erasing is unnecessary.
     canvas->SetBackgroundStyle(wxBG_STYLE_PAINT);
     return canvas;
 }
 
-bool OpenGLManager::is_scene_canvas(const wxWindow* window)
-{
-    return window != nullptr && window->GetName() == SCENE_CANVAS_NAME;
-}
-
 void OpenGLManager::detect_multisample(int* attribList)
 {
     int wxVersion = wxMAJOR_VERSION * 10000 + wxMINOR_VERSION * 100 + wxRELEASE_NUMBER;

src/slic3r/GUI/OpenGLManager.hpp

@@ -101,8 +101,6 @@ public:
     static bool are_framebuffers_supported() { return (s_framebuffers_type != EFramebufferType::Unknown); }
     static EFramebufferType get_framebuffers_type() { return s_framebuffers_type; }
     static wxGLCanvas* create_wxglcanvas(wxWindow& parent);
-    // True for a canvas made by create_wxglcanvas(), the kind a GLCanvas3D draws its scene and ImGui into.
-    static bool is_scene_canvas(const wxWindow* window);
     static const GLInfo& get_gl_info() { return s_gl_info; }
     static bool force_power_of_two_textures() { return s_force_power_of_two_textures; }
 

src/slic3r/GUI/Plater.cpp

@@ -20746,6 +20746,76 @@ void Plater::reslice()
     p->preview->reload_print();
 
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": finished, started slicing for plate %1%") % p->partplate_list.get_curr_plate_index();
+
+    record_slice_preset("slicing");
+}
+
+void Plater::record_slice_preset(std::string action)
+{
+    // record slice preset
+    try
+    {
+        json j;
+        auto printer_preset = wxGetApp().preset_bundle->printers.get_edited_preset_with_vendor_profile().preset;
+        if (printer_preset.is_system) {
+            j["printer_preset_name"] = printer_preset.name;
+        }
+        else {
+            j["printer_preset_name"] = printer_preset.config.opt_string("inherits");
+        }
+        const t_config_enum_values* keys_map = print_config_def.get("curr_bed_type")->enum_keys_map;
+        if (keys_map) {
+            for (auto item : *keys_map) {
+                if (item.second == wxGetApp().preset_bundle->project_config.opt_enum<BedType>("curr_bed_type")) {
+                    j["curr_bed_type"] = item.first;
+                    break;
+                }
+            }
+        }
+        auto filament_presets = wxGetApp().preset_bundle->filament_presets;
+        for (int i = 0; i < filament_presets.size(); ++i) {
+            auto filament_preset = wxGetApp().preset_bundle->filaments.find_preset(filament_presets[i]);
+            if (filament_preset->is_system) {
+                j["filament_preset_" + std::to_string(i)] = filament_preset->name;
+            }
+            else {
+                j["filament_preset_" + std::to_string(i)] = filament_preset->config.opt_string("inherits");
+            }
+        }
+
+        Preset& print_preset = wxGetApp().preset_bundle->prints.get_edited_preset();
+        if (print_preset.is_system) {
+            j["process_preset"] = print_preset.name;
+        }
+        else {
+            j["process_preset"] = print_preset.config.opt_string("inherits");
+        }
+        j["support_type"] = ConfigOptionEnum<SupportType>::get_enum_names().at(print_preset.config.opt_enum<SupportType>("support_type"));
+        j["sparse_infill_pattern"] = ConfigOptionEnum<InfillPattern>::get_enum_names().at(print_preset.config.opt_enum<InfillPattern>("sparse_infill_pattern"));
+        j["sparse_infill_density"] = print_preset.config.opt<ConfigOptionPercent>("sparse_infill_density")->value;
+
+        j["brim_type"] = ConfigOptionEnum<BrimType>::get_enum_names().at(print_preset.config.opt_enum<BrimType>("brim_type"));
+        j["user_mode"] = wxGetApp().get_mode_str();
+
+        if (p->background_process.fff_print()) {
+            const DynamicPrintConfig& full_config = p->background_process.fff_print()->full_print_config();
+            json values = json::array();
+            if (full_config.has("different_settings_to_system")) {
+                std::vector<std::string> different_values = full_config.option<ConfigOptionStrings>("different_settings_to_system")->values;
+                for (auto& item : different_values) {
+                    values.push_back(item);
+                }
+            }
+            j["different_settings_to_system"] = values;
+        }
+
+        j["record_event"] = action;
+        NetworkAgent* agent = wxGetApp().getAgent();
+    }
+    catch (...)
+    {
+        return;
+    }
 }
 
 //BBS: add project slicing related logic
@@ -21108,12 +21178,7 @@ void Plater::print_job_finished(wxCommandEvent &evt)
     Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
     if (!dev) return;
 
-    const std::string dev_id = evt.GetString().ToStdString();
+    dev->set_selected_machine(evt.GetString().ToStdString());
-    MachineObject* selected = dev->get_selected_machine();
-    // After a LAN print, the completion event reselects the same printer.
-    // Keep the active session while asynchronous status traffic may still be in flight.
-    if (!selected || selected->get_dev_id() != dev_id || selected->connection_type() != "lan")
-        dev->set_selected_machine(dev_id);
     p->main_frame->request_select_tab(TAB_ID_MONITOR);
     // Selects the status page on a built Device tab; one built by the switch starts there.
     MonitorPanel* curr_monitor = MonitorPanel::if_built();

src/slic3r/GUI/Plater.hpp

@@ -597,6 +597,7 @@ public:
     bool has_toolpaths_to_export() const;
     void export_toolpaths_to_obj() const;
     void reslice();
+    void record_slice_preset(std::string action);
     void reslice_SLA_supports(const ModelObject &object, bool postpone_error_messages = false);
     void reslice_SLA_hollowing(const ModelObject &object, bool postpone_error_messages = false);
     void reslice_SLA_until_step(SLAPrintObjectStep step, const ModelObject &object, bool postpone_error_messages = false);

src/slic3r/GUI/SelectMachine.cpp

@@ -4087,7 +4087,7 @@ void SelectMachineDialog::update_user_printer()
     {
         m_printer_last_select = "";
         update_select_layout(nullptr);
-        m_printer_box->GetPrinterComboBox()->SetValue(_L("No available printers"));
+        m_printer_box->GetPrinterComboBox()->SetTextLabel("");
     }
 
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "for send task, current printer id =  " << m_printer_last_select << std::endl;

src/slic3r/GUI/Selection.cpp

@@ -474,14 +474,17 @@ void Selection::add_curr_plate()
     if (!m_valid)
         return;
 
-    std::vector<unsigned int> volume_idxs = get_volume_idxs_from_plate(wxGetApp().plater()->get_partplate_list().get_curr_plate_index());
-    if (volume_idxs.empty())
-        return;
-
     wxGetApp().plater()->take_snapshot(std::string("Selection-Add Curr Plate All!"));
     m_mode = Instance;
     clear();
-    do_add_volumes(volume_idxs);
+
+    PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
+    for (int obj_idx = 0; obj_idx < m_model->objects.size(); obj_idx++) {
+        if (plate && plate->contain_instance_totally(obj_idx, 0)) {
+            std::vector<unsigned int> volume_idxs = get_volume_idxs_from_object(obj_idx);
+            do_add_volumes(volume_idxs);
+        }
+    }
 
     update_type();
     this->set_bounding_boxes_dirty();
@@ -508,14 +511,20 @@ void Selection::remove_curr_plate()
     if (!m_valid)
         return;
 
-    std::vector<unsigned int> volume_idxs = get_volume_idxs_from_plate(wxGetApp().plater()->get_partplate_list().get_curr_plate_index());
+    PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_curr_plate();
-    if (volume_idxs.empty())
+    if (plate->empty())
         return;
 
     wxGetApp().plater()->take_snapshot(std::string("Selection-Delete Curr Plate All"));
     m_mode = Instance;
     clear();
-    do_add_volumes(volume_idxs);
+
+    for (int obj_idx = 0; obj_idx < m_model->objects.size(); obj_idx++) {
+        if (plate && plate->contain_instance(obj_idx, 0)) {
+            std::vector<unsigned int> volume_idxs = get_volume_idxs_from_object(obj_idx);
+            do_add_volumes(volume_idxs);
+        }
+    }
 
     update_type();
     this->set_bounding_boxes_dirty();
@@ -2261,27 +2270,6 @@ std::vector<unsigned int> Selection::get_volume_idxs_from_volume(unsigned int ob
     return idxs;
 }
 
-std::vector<unsigned int> Selection::get_volume_idxs_from_plate(const int plate_idx) const
-{
-    PartPlate* plate = wxGetApp().plater()->get_partplate_list().get_plate(plate_idx);
-    std::vector<unsigned int> idxs;
-    if (!plate)
-        return idxs;
-
-    for (int obj_idx = 0; obj_idx < (int)m_model->objects.size(); obj_idx++) {
-        const ModelObject* obj = m_model->objects[obj_idx];
-        for (int inst_idx = 0; inst_idx < (int)obj->instances.size(); inst_idx++) {
-            // on this plate or overlapping it in some way (fully inside, oversized or partly outside)
-            if (plate->contain_instance(obj_idx, inst_idx) || plate->intersect_instance(obj_idx, inst_idx)) {
-                std::vector<unsigned int> inst_idxs = get_volume_idxs_from_instance(obj_idx, inst_idx);
-                idxs.insert(idxs.end(), inst_idxs.begin(), inst_idxs.end());
-            }
-        }
-    }
-
-    return idxs;
-}
-
 std::vector<unsigned int> Selection::get_missing_volume_idxs_from(const std::vector<unsigned int>& volume_idxs) const
 {
     std::vector<unsigned int> idxs;

src/slic3r/GUI/Selection.hpp

@@ -409,8 +409,6 @@ public:
     std::vector<unsigned int> get_volume_idxs_from_instance(unsigned int object_idx, unsigned int instance_idx) const;
     // returns the idx of the volume corresponding to the volume with the given idxs
     std::vector<unsigned int> get_volume_idxs_from_volume(unsigned int object_idx, unsigned int instance_idx, unsigned int volume_idx) const;
-    // returns the list of idxs of the volumes of all instances on the given plate or overlapping it. (fully inside, oversized or partly outside)
-    std::vector<unsigned int> get_volume_idxs_from_plate(const int plate_idx) const;
     // returns the list of idxs of the volumes contained in the selection but not in the given list
     std::vector<unsigned int> get_missing_volume_idxs_from(const std::vector<unsigned int>& volume_idxs) const;
     // returns the list of idxs of the volumes contained in the given list but not in the selection

src/slic3r/GUI/SendToPrinter.cpp

@@ -1229,7 +1229,7 @@ void SendToPrinterDialog::update_user_printer()
     }
     else {
         m_printer_last_select = "";
-        m_comboBox_printer->SetValue(_L("No available printers"));
+        m_comboBox_printer->SetTextLabel("");
     }
 
     BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << "for send task, current printer id =  " << m_printer_last_select << std::endl;

src/slic3r/GUI/TextureLibrary.cpp

@@ -223,11 +223,23 @@ std::vector<unsigned char> read_file_bytes(const std::string &path)
     return std::vector<unsigned char>(std::istreambuf_iterator<char>(ifs), std::istreambuf_iterator<char>());
 }
 
-// True if decode_height_texture() can read these bytes, so they can be stored on a layer as-is.
+// True if these bytes are a PNG libslic3r can decode, i.e. can be stored on a layer as-is. Mirrors
-// Anything else is converted on load.
+// exactly what decode_height_texture() accepts: 8-bit grayscale, or 8-bit colour (whose luminance is
+// the height and whose RGB is available to colour the model). Anything else is converted on load.
 bool is_supported_height_map(const std::vector<unsigned char> &bytes)
 {
-    return !bytes.empty() && png::is_decodable_8bit_png(png::ReadBuf{ bytes.data(), bytes.size() });
+    if (bytes.empty())
+        return false;
+    const png::ReadBuf rbuf{ bytes.data(), bytes.size() };
+    if (!png::is_png(rbuf))
+        return false;
+    png::ImageGreyscale gray;
+    if (png::decode_png(rbuf, gray) && gray.cols > 0 && gray.rows > 0)
+        return true;
+    png::ImageColorscale color;
+    return png::decode_colored_png(rbuf, color) && color.cols > 0 && color.rows > 0 &&
+           color.bytes_per_pixel >= 3 &&
+           color.buf.size() == color.cols * color.rows * size_t(color.bytes_per_pixel);
 }
 
 std::vector<TextureLibraryEntry> g_library;

src/slic3r/GUI/TroubleshootDialog.cpp

@@ -74,7 +74,6 @@
 #endif
 
 #ifdef __LINUX__
-#include "LinuxDisplayBackend.hpp"
 #include <wx/textfile.h>
 #include <wx/tokenzr.h>
 #include <cstdlib>
@@ -202,11 +201,7 @@ TroubleshootDialog::TroubleshootDialog()
             return std::vector<wxString>{GetOStype()};
         return std::vector<wxString>{
             GetOSinfo(),
-#ifdef __LINUX__
-            GetPackageType() + GetAppDisplayBackend(),
-#else
             GetPackageType(),
-#endif
             GetCPUinfo(),
             GetRAMinfo() + " RAM",
             GetGPUinfo(),
@@ -439,15 +434,10 @@ wxString TroubleshootDialog::GetTimestamp()
 
 wxString TroubleshootDialog::GetSysInfoAll()
 {
-    wxString package = GetPackageType();
-#ifdef __LINUX__
-    package += GetAppDisplayBackend();
-#endif
-
     wxString info;
     info += "Version   :  " + wxString(SoftFever_VERSION) + "\n"
           + "Build     :  " + wxString(build_commit_label) + "\n"
-          + "Package   :  " + package + "\n"
+          + "Package   :  " + GetPackageType() + "\n"
           + "Platform  :  " + GetOSinfo()      + "\n"
           + "Processor :  " + GetCPUinfo() + "\n"
           + "Memory    :  " + GetRAMinfo() + "RAM" + "\n"
@@ -761,18 +751,6 @@ wxString TroubleshootDialog::GetLinuxDisplayServer()
 
     return "";
 }
-
-wxString TroubleshootDialog::GetAppDisplayBackend()
-{
-    // Display backend actually used by the app (GDK), not the session type
-    wxString display;
-    switch (get_linux_display_backend()) {
-        case LinuxDisplayBackend::X11:     display = "X11";     break;
-        case LinuxDisplayBackend::Wayland: display = "Wayland"; break;
-        default: break;
-    }
-    return display.IsEmpty() ? "" : (" (" + display + ")"); // spacing included here to prevent non centered text
-}
 #endif
 
 wxString TroubleshootDialog::GetPackageType()

src/slic3r/GUI/TroubleshootDialog.hpp

@@ -68,7 +68,6 @@ protected:
 #elif defined(__LINUX__)
     wxString GetLinuxDistroName();
     wxString GetLinuxDisplayServer();
-    wxString GetAppDisplayBackend();
 #endif
     wxString GetPackageType();
     wxString GetCPUinfo();

src/slic3r/GUI/Widgets/ComboBox.cpp

@@ -287,7 +287,7 @@ void ComboBox::DoDeleteOneItem(unsigned int pos)
 
 void ComboBox::ForceDropdownOpen()
 {
-    if (!IsEnabled() || items.empty())
+    if (!IsEnabled())
         return;
 
     if (!drop_down) {
@@ -398,7 +398,7 @@ void ComboBox::mouseDown(wxMouseEvent &event)
     SetFocus();
     if (drop_down) {
         drop.Hide();
-    } else if (!items.empty() && drop.HasDismissLongTime()) { // DropDown paints nothing for an empty list
+    } else if (drop.HasDismissLongTime()) {
         drop.autoPosition();
         drop_down = true;
         drop.Popup(&drop);
@@ -426,7 +426,7 @@ void ComboBox::keyDown(wxKeyEvent& event)
         case WXK_SPACE:
             if (drop_down) {
                 drop.DismissAndNotify();
-            } else if (!items.empty() && drop.HasDismissLongTime()) {
+            } else if (drop.HasDismissLongTime()) {
                 drop.autoPosition();
                 drop_down = true;
                 drop.Popup();

src/slic3r/Utils/MoonrakerPrinterAgent.cpp

@@ -5,7 +5,6 @@
 #include "bambu_networking.hpp"
 #include "libslic3r/Preset.hpp"
 #include "libslic3r/PresetBundle.hpp"
-#include "libslic3r/Utils.hpp"
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/I18N.hpp"
 #include "slic3r/GUI/DeviceManager.hpp"
@@ -20,19 +19,14 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/asio/buffer.hpp>
 #include <boost/asio/connect.hpp>
-#include <boost/asio/error.hpp>
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/tcp.hpp>
-#include <boost/asio/post.hpp>
-#include <boost/asio/steady_timer.hpp>
 #include <boost/beast/core.hpp>
 #include <boost/beast/core/tcp_stream.hpp>
 #include <boost/beast/http/field.hpp>
 #include <boost/beast/core/flat_buffer.hpp>
 #include <boost/beast/core/error.hpp>
 #include <boost/beast/core/buffers_to_string.hpp>
-#include <boost/beast/core/stream_traits.hpp>
-#include <boost/beast/core/string_type.hpp>
 #include <boost/beast/websocket.hpp>
 #include <boost/beast/websocket/stream.hpp>
 #include <boost/beast/websocket/stream_base.hpp>
@@ -43,7 +37,6 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/log/trivial.hpp>
 #include <algorithm>
-#include <atomic>
 #include <chrono>
 #include <cstdint>
 #include <cctype>
@@ -127,31 +120,6 @@ std::string map_moonraker_state(std::string state)
     return "IDLE";
 }
 
-// Runs one asynchronous operation to completion, because synchronous Beast calls ignore timeouts and cannot be aborted
-template<class Initiate>
-beast::error_code run_until_done(net::io_context& ioc, const std::atomic<bool>& stop, Initiate&& initiate)
-{
-    // An abort that runs before the operation starts finds nothing to cancel
-    if (stop.load()) {
-        return net::error::operation_aborted;
-    }
-    beast::error_code result;
-    bool              done = false;
-    initiate([&](beast::error_code ec, auto&&...) {
-        result = ec;
-        done   = true;
-    });
-    ioc.restart();
-    while (!done && ioc.run_one() != 0) {} // run() never returns while the websocket idle timer is armed
-    return done ? result : beast::error_code{net::error::operation_aborted};
-}
-
-uint64_t steady_now_ms()
-{
-    return static_cast<uint64_t>(
-        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count());
-}
-
 } // namespace
 
 namespace Slic3r {
@@ -1330,8 +1298,6 @@ bool MoonrakerPrinterAgent::fetch_object_list(const std::string&     base_url,
     }
     http.timeout_connect(5)
         .timeout_max(10)
-        // Gives up once the status stream, the only caller, stops
-        .on_progress([this](Http::Progress, bool& cancel) { cancel = ws_stop.load(); })
         .on_complete([&](std::string body, unsigned status) {
             if (status == 200) {
                 response_body = body;
@@ -1502,47 +1468,19 @@ void MoonrakerPrinterAgent::start_status_stream(const std::string& dev_id, const
         return;
     }
 
-    std::lock_guard<std::mutex> lock(ws_abort_mutex);
     ws_stop.store(false);
-    ws_thread = std::thread(
+    ws_thread = std::thread([this, dev_id, base_url, api_key]() { run_status_stream(dev_id, base_url, api_key); });
-        [this, dev_id, base_url, api_key, timings = ws_timings]() { run_status_stream(dev_id, base_url, api_key, timings); });
 }
 
 void MoonrakerPrinterAgent::stop_status_stream()
 {
-    std::thread stopped;
+    ws_stop.store(true);
-    {
+    if (ws_thread.joinable()) {
-        std::lock_guard<std::mutex> lock(ws_abort_mutex);
+        ws_thread.join();
-        ws_stop.store(true);
-        if (ws_abort) {
-            ws_abort();
-        }
-        // A callback on the stream thread can stop the stream, which then ends on its own and is joined later, outside connect_mutex
-        if (ws_thread.get_id() != std::this_thread::get_id()) {
-            stopped = std::move(ws_thread);
-        }
-    }
-    if (stopped.joinable()) {
-        stopped.join();
     }
 }
 
-void MoonrakerPrinterAgent::join_stopped_status_stream()
+void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string base_url, std::string api_key)
-{
-    std::thread stopped;
-    {
-        std::lock_guard<std::mutex> lock(ws_abort_mutex);
-        // A running stream belongs to a newer connection, so only one that is already stopping is joined
-        if (ws_stop.load() && ws_thread.get_id() != std::this_thread::get_id()) {
-            stopped = std::move(ws_thread);
-        }
-    }
-    if (stopped.joinable()) {
-        stopped.join();
-    }
-}
-
-void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string base_url, std::string api_key, StatusStreamTimings timings)
 {
     WsEndpoint endpoint;
     if (!parse_ws_endpoint(base_url, endpoint)) {
@@ -1554,108 +1492,25 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
         return;
     }
 
-    net::io_context       ioc;
-    net::steady_timer     backoff{ioc};
-    std::function<void()> abort_connection; // Set while a connection attempt runs
-    const auto            run = [&](auto&& initiate) { return run_until_done(ioc, ws_stop, initiate); };
-
-    // Registered under the lock stop_status_stream() takes, so a stop either finds this abort or has already set ws_stop
-    {
-        std::lock_guard<std::mutex> lock(ws_abort_mutex);
-        if (ws_stop.load()) {
-            return;
-        }
-        ws_abort = [&] {
-            net::post(ioc, [&] {
-                backoff.cancel();
-                if (abort_connection) {
-                    abort_connection();
-                }
-            });
-        };
-    }
-    const ScopeGuard clear_abort([this] {
-        std::lock_guard<std::mutex> lock(ws_abort_mutex);
-        ws_abort = nullptr;
-    });
-
     // Reconnection logic
     ws_reconnect_requested.store(false); // Reset reconnect flag
-    int retry_count = 0;
+    int       retry_count   = 0;
+    const int max_retries   = 10;
+    const int base_delay_ms = 1000;
 
-    while (!ws_stop.load()) {
+    while (!ws_stop.load() && retry_count < max_retries) {
         bool connection_lost = false; // Flag to distinguish clean shutdown from unexpected disconnect
 
-        tcp::resolver                        resolver{ioc};
-        websocket::stream<beast::tcp_stream> ws{ioc};
-        beast::tcp_stream&                   stream = beast::get_lowest_layer(ws);
-        net::steady_timer                    close_deadline{ioc};
-        bool                                 closing          = false;
-        bool                                 deadline_pending = false;
-        auto                                 last_message     = std::chrono::steady_clock::now();
-        // Sends a close frame if the websocket is open, and drops the socket when the printer has not answered within timings.close
-        const auto close_politely = [&](websocket::close_code code) {
-            if (!ws.is_open() || closing) {
-                return;
-            }
-            closing          = true;
-            deadline_pending = true;
-            close_deadline.expires_after(timings.close);
-            close_deadline.async_wait([&](beast::error_code ec) {
-                deadline_pending = false;
-                if (!ec) {
-                    beast::error_code ignored;
-                    stream.socket().close(ignored);
-                }
-            });
-            ws.async_close(code, [&](beast::error_code) {
-                closing = false;
-                close_deadline.cancel();
-            });
-        };
-        abort_connection = [&] {
-            // Beast reports a closing websocket as not open, and dropping its socket would cut off the close frame
-            if (closing) {
-                return;
-            }
-            if (ws.is_open()) {
-                close_politely(websocket::close_code::going_away);
-            } else {
-                beast::error_code ignored;
-                stream.socket().close(ignored);
-            }
-        };
-        const ScopeGuard clear_connection_abort([&] { abort_connection = nullptr; });
-
         try {
-            beast::error_code connect_ec = net::error::host_not_found;
+            net::io_context   ioc;
-            for (const auto& entry : resolver.resolve(endpoint.host, endpoint.port)) {
+            tcp::resolver     resolver{ioc};
-                beast::error_code ignored;
+            beast::tcp_stream stream{ioc};
-                stream.socket().close(ignored); // A failed attempt leaves the socket open
-                stream.expires_after(std::chrono::seconds(5));
-                connect_ec = run([&](auto&& handler) { stream.async_connect(entry.endpoint(), handler); });
-                if (!connect_ec || ws_stop.load()) {
-                    break;
-                }
-            }
-            if (connect_ec) {
-                throw beast::system_error{connect_ec};
-            }
-            // Clears the connect deadline, which would otherwise close the socket 5 s after connecting
-            stream.expires_never();
 
-            websocket::stream_base::timeout timeouts{};
+            stream.expires_after(std::chrono::seconds(10));
-            timeouts.handshake_timeout = timings.handshake;
+            auto const results = resolver.resolve(endpoint.host, endpoint.port);
-            timeouts.idle_timeout      = timings.idle;
+            stream.connect(results);
-            timeouts.keep_alive_pings  = true;
+
-            ws.set_option(timeouts);
+            websocket::stream<beast::tcp_stream> ws{std::move(stream)};
-            // Beast pings on a fixed schedule, so the heartbeat also checks how long the printer has sent no message
-            ws.control_callback([&](websocket::frame_type kind, beast::string_view) {
-                if (kind == websocket::frame_type::pong && !closing &&
-                    std::chrono::steady_clock::now() - last_message >= timings.heartbeat) {
-                    send_heartbeat_if_due(dev_id, timings.heartbeat);
-                }
-            });
             ws.set_option(websocket::stream_base::decorator([&](websocket::request_type& req) {
                 req.set(http::field::user_agent, "OrcaSlicer");
                 if (!api_key.empty()) {
@@ -1667,9 +1522,7 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
             if (!endpoint.port.empty() && endpoint.port != "80") {
                 host_header += ":" + endpoint.port;
             }
-            if (const auto ec = run([&](auto&& handler) { ws.async_handshake(host_header, endpoint.target, handler); })) {
+            ws.handshake(host_header, endpoint.target);
-                throw beast::system_error{ec};
-            }
             ws.text(true);
 
             // Send client identification
@@ -1681,10 +1534,7 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
             identify["params"]["type"]        = "agent";
             identify["params"]["url"]         = "https://github.com/SoftFever/OrcaSlicer";
             identify["id"]                    = 0;
-            const std::string identify_payload = identify.dump();
+            ws.write(net::buffer(identify.dump()));
-            if (const auto ec = run([&](auto&& handler) { ws.async_write(net::buffer(identify_payload), handler); })) {
-                throw beast::system_error{ec};
-            }
 
             std::set<std::string> subscribe_objects = {"print_stats", "virtual_sdcard"};
             std::set<std::string> available_objects;
@@ -1736,17 +1586,28 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
             }
             subscribe["params"]["objects"] = std::move(objects);
             subscribe["id"]                = 1;
-            const std::string subscribe_payload = subscribe.dump();
+            ws.write(net::buffer(subscribe.dump()));
-            if (const auto ec = run([&](auto&& handler) { ws.async_write(net::buffer(subscribe_payload), handler); })) {
-                throw beast::system_error{ec};
-            }
 
             // Read loop
             while (!ws_stop.load()) {
+                ws.next_layer().expires_after(std::chrono::seconds(2));
                 beast::flat_buffer buffer;
-                const auto         ec = run([&](auto&& handler) { ws.async_read(buffer, handler); });
+                beast::error_code  ec;
-                if (ws_stop.load()) {
+                ws.read(buffer, ec);
-                    break;
+                if (ec == beast::error::timeout) {
+                    const auto now_ms = static_cast<uint64_t>(
+                        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count());
+                    const auto last_ms = ws_last_emit_ms.load();
+                    if (last_ms == 0 || now_ms - last_ms >= 10000) {
+                        nlohmann::json message;
+                        {
+                            std::lock_guard<std::recursive_mutex> lock(payload_mutex);
+                            message = build_print_payload_locked();
+                        }
+                        dispatch_message(dev_id, message.dump());
+                        ws_last_emit_ms.store(now_ms);
+                    }
+                    continue;
                 }
                 if (ec == websocket::error::closed) {
                     connection_lost = true;
@@ -1757,9 +1618,6 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
                     connection_lost = true;
                     break;
                 }
-                last_message = std::chrono::steady_clock::now();
-                // A message shows the printer is answering, so the next drop starts the backoff from reconnect_delay
-                retry_count = 0;
                 handle_ws_message(dev_id, beast::buffers_to_string(buffer.data()));
                 // Check if handle_ws_message triggered reconnection request
                 if (ws_reconnect_requested.exchange(false)) {
@@ -1767,18 +1625,20 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
                     break;
                 }
             }
-        } catch (const std::exception& e) {
+
-            if (!ws_stop.load()) {
+            beast::error_code ec;
-                BOOST_LOG_TRIVIAL(warning) << "MoonrakerPrinterAgent: websocket disconnected: " << e.what();
+            ws.close(websocket::close_code::normal, ec);
+
+            // Only reset retry count on clean shutdown (not connection_lost)
+            if (!connection_lost && !ws_stop.load()) {
+                retry_count = 0;
             }
+
+        } catch (const std::exception& e) {
+            BOOST_LOG_TRIVIAL(warning) << "MoonrakerPrinterAgent: websocket disconnected: " << e.what();
             connection_lost = true;
         }
 
-        close_politely(ws_stop.load() ? websocket::close_code::going_away : websocket::close_code::normal);
-        ioc.restart();
-        // Both handlers refer to this connection, so neither may be left queued for the next one
-        while ((closing || deadline_pending) && ioc.run_one() != 0) {}
-
         // Exit loop on clean shutdown
         if (!connection_lost) {
             break;
@@ -1789,13 +1649,17 @@ void MoonrakerPrinterAgent::run_status_stream(std::string dev_id, std::string ba
             break;
         }
 
-        // Exponential backoff before reconnection, capped at 32 times reconnect_delay so a printer that comes back is found again
+        // Exponential backoff before reconnection
-        const auto delay = timings.reconnect_delay * (1 << std::min(retry_count, 5));
+        int delay_ms = base_delay_ms * (1 << std::min(retry_count, 5));
-        BOOST_LOG_TRIVIAL(info) << "MoonrakerPrinterAgent: Reconnecting in " << delay.count() << "ms (attempt " << (retry_count + 1) << ")";
+        BOOST_LOG_TRIVIAL(info) << "MoonrakerPrinterAgent: Reconnecting in " << delay_ms << "ms (attempt " << (retry_count + 1) << ")";
-        backoff.expires_after(delay);
+        std::this_thread::sleep_for(std::chrono::milliseconds(delay_ms));
-        run([&](auto&& handler) { backoff.async_wait(handler); });
         retry_count++;
     }
+
+    if (retry_count >= max_retries) {
+        BOOST_LOG_TRIVIAL(error) << "MoonrakerPrinterAgent: Max reconnection attempts reached";
+        dispatch_local_connect(ConnectStatusLost, dev_id, "max_retries");
+    }
 }
 
 void MoonrakerPrinterAgent::handle_ws_message(const std::string& dev_id, const std::string& payload)
@@ -1869,7 +1733,8 @@ void MoonrakerPrinterAgent::handle_ws_message(const std::string& dev_id, const s
     }
 
     if (updated) {
-        const auto now_ms           = steady_now_ms();
+        const auto now_ms = static_cast<uint64_t>(
+            std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now().time_since_epoch()).count());
         const auto last_dispatch_ms = ws_last_dispatch_ms.load();
 
         // Dispatch if: critical change OR throttle interval elapsed
@@ -1890,24 +1755,6 @@ void MoonrakerPrinterAgent::handle_ws_message(const std::string& dev_id, const s
     }
 }
 
-void MoonrakerPrinterAgent::send_heartbeat_if_due(const std::string& dev_id, std::chrono::milliseconds interval)
-{
-    const auto now_ms  = steady_now_ms();
-    const auto last_ms = ws_last_emit_ms.load();
-    // Re-sends only a status the printer has reported at least once
-    if (last_ms == 0 || now_ms - last_ms < static_cast<uint64_t>(interval.count())) {
-        return;
-    }
-
-    nlohmann::json message;
-    {
-        std::lock_guard<std::recursive_mutex> lock(payload_mutex);
-        message = build_print_payload_locked();
-    }
-    dispatch_message(dev_id, message.dump());
-    ws_last_emit_ms.store(now_ms);
-}
-
 void MoonrakerPrinterAgent::update_status_cache(const nlohmann::json& updates)
 {
     if (!updates.is_object()) {
@@ -2292,15 +2139,8 @@ void MoonrakerPrinterAgent::perform_connection_async(const std::string& dev_id,
             BOOST_LOG_TRIVIAL(warning) << "MoonrakerPrinterAgent: Initial status query failed: " << error_msg;
         }
 
-        join_stopped_status_stream();
+        // Start WebSocket status stream
-        // Holds connect_mutex across the staleness check and the start, so a disconnect during the queries above prevents the start
+        start_status_stream(dev_id, base_url, api_key);
-        {
-            std::lock_guard<std::recursive_mutex> lock(connect_mutex);
-            if (is_stale()) {
-                return;
-            }
-            start_status_stream(dev_id, base_url, api_key);
-        }
 #endif
 
         // Success!

src/slic3r/Utils/MoonrakerPrinterAgent.hpp

@@ -5,7 +5,6 @@
 #include "bambu_networking.hpp"
 
 #include <functional>
-#include <chrono>
 #include <cstdint>
 #include <atomic>
 #include <memory>
@@ -86,16 +85,6 @@ protected:
         bool        use_ssl = false;
     } device_info;
 
-    // Copied when the stream starts, so changes apply to the next start_status_stream()
-    struct StatusStreamTimings
-    {
-        std::chrono::milliseconds handshake{std::chrono::seconds(10)};      // Opening and closing handshakes
-        std::chrono::milliseconds close{std::chrono::seconds(1)};           // Wait for the close frame's answer before dropping the socket
-        std::chrono::milliseconds idle{std::chrono::seconds(30)};           // Silence before giving up, with a ping every half of it
-        std::chrono::milliseconds heartbeat{std::chrono::seconds(10)};      // Silence before the cached status is sent again
-        std::chrono::milliseconds reconnect_delay{std::chrono::seconds(1)}; // First wait, doubling per consecutive failure up to 32x
-    } ws_timings;
-
     // Tray data for AMS payload building
     struct AmsTrayData {
         int         slot_index = 0;      // 0-based slot index
@@ -113,8 +102,6 @@ protected:
     // Methods that derived classes may need to override or access
     virtual bool init_device_info(const std::string& dev_id, const std::string& dev_ip, const std::string& username, const std::string& password, bool use_ssl, const std::string& port);
     virtual bool fetch_device_info(const std::string& base_url, const std::string& api_key, MoonrakerDeviceInfo& info, std::string& error) const;
-    void start_status_stream(const std::string& dev_id, const std::string& base_url, const std::string& api_key);
-    void stop_status_stream();
 
     // State access for derived classes
     mutable std::recursive_mutex       state_mutex;
@@ -146,11 +133,10 @@ private:
     void dispatch_local_connect(int state, const std::string& dev_id, const std::string& msg);
     void dispatch_printer_connected(const std::string& dev_id);
     void dispatch_message(const std::string& dev_id, const std::string& payload);
-    // Joins a stream stopped from its own callback, so a new stream can start without waiting on it under connect_mutex
+    void start_status_stream(const std::string& dev_id, const std::string& base_url, const std::string& api_key);
-    void join_stopped_status_stream();
+    void stop_status_stream();
-    void run_status_stream(std::string dev_id, std::string base_url, std::string api_key, StatusStreamTimings timings);
+    void run_status_stream(std::string dev_id, std::string base_url, std::string api_key);
     void handle_ws_message(const std::string& dev_id, const std::string& payload);
-    void send_heartbeat_if_due(const std::string& dev_id, std::chrono::milliseconds interval);
     void update_status_cache(const nlohmann::json& updates);
     nlohmann::json build_print_payload_locked() const;
 
@@ -210,8 +196,6 @@ private:
     std::atomic<bool>   ws_reconnect_requested{false};  // Flag to trigger reconnection
     std::atomic<uint64_t> ws_last_emit_ms{0};
     std::thread         ws_thread;
-    std::mutex          ws_abort_mutex; // Guards ws_thread and ws_abort
-    std::function<void()> ws_abort; // Interrupts whatever the stream thread is waiting on, from any thread
 
     // Throttling configuration for WebSocket updates
     // Critical changes (state transitions) dispatch immediately; telemetry is throttled

src/slic3r/plugin/PluginFsUtils.cpp

@@ -34,6 +34,10 @@
 #include <unordered_set>
 #include <vector>
 
+#ifdef WIN32
+#include <boost/locale/encoding_utf.hpp>
+#endif
+
 namespace Slic3r {
 
 const char* const INSTALL_STATE_FILE = ".install_state.json";
@@ -661,7 +665,7 @@ bool extract_zip_to_directory(const boost::filesystem::path& zip_path, const boo
     namespace fs = boost::filesystem;
 
     boost::system::error_code ec;
-    fs::create_directories(extended_path(destination), ec);
+    fs::create_directories(destination, ec);
     if (ec) {
         error = "Failed to create plugin staging directory: " + ec.message();
         return false;
@@ -705,7 +709,7 @@ bool extract_zip_to_directory(const boost::filesystem::path& zip_path, const boo
 
         const fs::path output_path = destination / relative_path;
         if (stat.m_is_directory || mz_zip_reader_is_file_a_directory(&reader.archive, stat.m_file_index)) {
-            fs::create_directories(extended_path(output_path), ec);
+            fs::create_directories(output_path, ec);
             if (ec) {
                 error = "Failed to create plugin zip directory " + output_path.string() + ": " + ec.message();
                 return false;
@@ -713,19 +717,26 @@ bool extract_zip_to_directory(const boost::filesystem::path& zip_path, const boo
             continue;
         }
 
-        fs::create_directories(extended_path(output_path.parent_path()), ec);
+        fs::create_directories(output_path.parent_path(), ec);
         if (ec) {
             error = "Failed to create plugin zip parent directory " + output_path.parent_path().string() + ": " + ec.message();
             return false;
         }
 
-        if (fs::exists(extended_path(output_path), ec) && fs::is_directory(extended_path(output_path), ec)) {
+        if (fs::exists(output_path, ec) && fs::is_directory(output_path, ec)) {
             error = "Plugin zip file conflicts with an existing directory: " + output_path.string();
             return false;
         }
 
-        // Shared with the rest of the archive code: long-path capable and binary-safe.
+        const std::string encoded_output_path = encode_path(output_path.string().c_str());
-        if (!extract_zip_entry_to_file(&reader.archive, stat.m_file_index, output_path)) {
+        mz_bool extracted = mz_zip_reader_extract_to_file(&reader.archive, stat.m_file_index, encoded_output_path.c_str(), 0);
+#ifdef WIN32
+        if (!extracted) {
+            const std::wstring wide_output_path = boost::locale::conv::utf_to_utf<wchar_t>(output_path.generic_string());
+            extracted = mz_zip_reader_extract_to_file_w(&reader.archive, stat.m_file_index, wide_output_path.c_str(), 0);
+        }
+#endif
+        if (!extracted) {
             error = "Failed to extract plugin zip entry " + relative_key + ": " +
                     MZ_Archive::get_errorstr(mz_zip_get_last_error(&reader.archive));
             return false;

tests/fff_print/test_perimeters.cpp

@@ -22,7 +22,6 @@
 #include "libslic3r/ClipperUtils.hpp"
 #include "libslic3r/ExPolygon.hpp"
 #include "libslic3r/Point.hpp"
-#include "libslic3r/Polygon.hpp"
 #include "libslic3r/Polyline.hpp"
 #include <limits>
 #include <string>
@@ -995,384 +994,3 @@ TEST_CASE("A hole whose outer wall touches the contour's runs with it", "[Perime
         CHECK(layers[i].holes_ccw.front() == ccw);
     }
 }
-
-namespace {
-
-// The outer radius of round_tube().
-const double tube_radius = 11.5;
-
-// Every setting the tube walls below are measured against. With 0.5mm walls a 1mm tube wall holds only the two
-// outer walls, touching, and every further 0.5mm makes room for one more inner wall.
-DynamicPrintConfig tube_config(const char *wall_generator, int wall_loops)
-{
-    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
-    config.set_deserialize_strict({
-        { "wall_generator",             wall_generator },
-        { "wall_loops",                 wall_loops },
-        { "wall_sequence",              "inner wall/outer wall" },
-        { "wall_direction",             "ccw" },
-        { "layer_height",               0.2 },
-        { "initial_layer_print_height", 0.2 },
-        { "nozzle_diameter",            "0.4" },
-        { "outer_wall_line_width",      0.5 },
-        { "inner_wall_line_width",      0.5 },
-        { "precise_outer_wall",         true },
-        { "detect_thin_wall",           false },
-        { "only_one_wall_top",          false },
-        { "only_one_wall_first_layer",  false },
-        { "brim_type",                  "no_brim" },
-        { "detect_overhang_wall",       true },
-        { "overhang_reverse",           false },
-        { "overhang_reverse_threshold", "0%" },
-    });
-    return config;
-}
-
-// A 2mm tall round tube whose wall is `wall` mm thick.
-Print &round_tube(Print &print, Model &model, const DynamicPrintConfig &config, double wall)
-{
-    ModelObject *object = model.add_object();
-    object->name = "round_tube.stl";
-    object->add_volume(make_cylinder(tube_radius, 2.), ModelVolumeType::MODEL_PART, false);
-    object->add_volume(make_cylinder(tube_radius - wall, 2.), ModelVolumeType::NEGATIVE_VOLUME, false);
-    object->add_instance();
-    object->ensure_on_bed();
-
-    print.auto_assign_extruders(object);
-    print.apply(model, config);
-    print.validate();
-    print.set_status_silent();
-    print.process();
-    return print;
-}
-
-// The side of the tube wall a wall loop lies on. The centre is the middle of the tube wall, where Arachne lays the
-// inner wall both sides share when the tube wall is too narrow for a pair of them.
-enum class TubeSide { Contour, Hole, Centre };
-
-struct TubeLoop {
-    TubeSide side;
-    int      inset;
-    bool     ccw;
-};
-
-// The wall loops of every layer of round_tube() in extrusion order.
-std::vector<std::vector<TubeLoop>> tube_loops(const Print &print, double wall)
-{
-    const double centre = tube_radius - 0.5 * wall;
-    std::vector<std::vector<TubeLoop>> out;
-    for (const Layer *layer : print.objects().front()->layers()) {
-        const Vec2d axis = get_extents(layer->lslices).center().cast<double>();
-        std::vector<TubeLoop> &loops = out.emplace_back();
-        for (const LayerRegion *region : layer->regions())
-            for (const ExtrusionEntity *entity : region->perimeters.flatten().entities) {
-                if (! entity->is_loop())
-                    continue;
-                const ExtrusionLoop *loop    = static_cast<const ExtrusionLoop*>(entity);
-                const Polygon        polygon = loop->polygon();
-                double               radius  = 0.;
-                for (const Point &p : polygon.points)
-                    radius += unscaled<double>((p.cast<double>() - axis).norm());
-                radius /= double(polygon.points.size());
-                const TubeSide side = radius > centre + 0.1 ? TubeSide::Contour : radius < centre - 0.1 ? TubeSide::Hole : TubeSide::Centre;
-                loops.push_back({ side, loop->inset_idx, polygon.is_counter_clockwise() });
-            }
-    }
-    return out;
-}
-
-// The insets one side of a wall is printed in, given its deepest inset: inside out for Inner/Outer, outside in for
-// Outer/Inner, and for Inner/Outer/Inner the third wall onwards inside out, then the outer wall, then the first inner
-// wall. Inner/Outer/Inner prints its first layer Inner/Outer, and outside in when there is no third wall.
-std::vector<int> wall_sequence_insets(const std::string &wall_sequence, bool first_layer, int deepest)
-{
-    std::vector<int> insets;
-    if (wall_sequence == "inner wall/outer wall" || (wall_sequence == "inner-outer-inner wall" && first_layer)) {
-        for (int inset = deepest; inset >= 0; -- inset)
-            insets.push_back(inset);
-    } else if (wall_sequence == "outer wall/inner wall" || deepest < 2) {
-        for (int inset = 0; inset <= deepest; ++ inset)
-            insets.push_back(inset);
-    } else {
-        for (int inset = deepest; inset >= 2; -- inset)
-            insets.push_back(inset);
-        insets.push_back(0);
-        insets.push_back(1);
-    }
-    return insets;
-}
-
-// Whether a wall of round_tube() runs with the contour: all but the walls of the hole, and those too when the hole
-// is a thin wall hole, its outer wall touching the contour's with nothing between them.
-bool runs_with_contour(const TubeLoop &loop, bool thin_wall_hole)
-{
-    return loop.side != TubeSide::Hole || thin_wall_hole;
-}
-
-// The insets of the walls on one side of a round_tube() layer, the shared centre line included, in extrusion order.
-std::vector<int> side_insets(const std::vector<TubeLoop> &loops, TubeSide side)
-{
-    std::vector<int> insets;
-    for (const TubeLoop &loop : loops)
-        if (loop.side == side || loop.side == TubeSide::Centre)
-            insets.push_back(loop.inset);
-    return insets;
-}
-
-// The walls of a round_tube() layer in extrusion order, as side and inset: "c0 c1 h0 h1" is the contour's outer wall,
-// then its first inner wall, then the same for the hole, and "m" marks the wall in the middle both sides share.
-std::string wall_order(const std::vector<TubeLoop> &loops)
-{
-    std::string out;
-    for (const TubeLoop &loop : loops)
-        out += std::string(out.empty() ? "" : " ") + (loop.side == TubeSide::Contour ? "c" : loop.side == TubeSide::Hole ? "h" : "m") +
-               std::to_string(loop.inset);
-    return out;
-}
-
-} // namespace
-
-// Each side of a tube wall prints its walls in the order the wall sequence asks for, from two walls a side up to
-// four. The inner wall Arachne lays in the middle of a wall too narrow for a pair of them is an inner wall of both
-// sides; Classic fills that middle with gap fill instead, so it has one wall less a side there.
-TEST_CASE("Each side of a tube wall prints its walls in the wall sequence order", "[Perimeters]")
-{
-    struct TubeWall {
-        double wall;
-        int    wall_loops;
-        // Walls a side, a shared inner wall included.
-        int    arachne_walls;
-        int    classic_walls;
-    };
-    const TubeWall tube = GENERATE(values<TubeWall>({
-        { 1.5, 3, 2, 1 }, { 2.0, 2, 2, 2 }, { 2.5, 3, 3, 2 }, { 3.0, 3, 3, 3 }, { 4.0, 4, 4, 4 } }));
-    const char       *wall_generator = GENERATE("classic", "arachne");
-    const std::string wall_sequence  = GENERATE("inner wall/outer wall", "outer wall/inner wall", "inner-outer-inner wall");
-    CAPTURE(tube.wall, tube.wall_loops, wall_generator, wall_sequence);
-
-    DynamicPrintConfig config = tube_config(wall_generator, tube.wall_loops);
-    config.set_deserialize_strict("wall_sequence", wall_sequence);
-    Print print;
-    Model model;
-    round_tube(print, model, config, tube.wall);
-    const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, tube.wall);
-    // 2mm at 0.2mm layers.
-    REQUIRE(layers.size() == 10);
-
-    const int walls = std::string(wall_generator) == "arachne" ? tube.arachne_walls : tube.classic_walls;
-    for (size_t i = 0; i < layers.size(); ++ i) {
-        for (const TubeSide side : { TubeSide::Contour, TubeSide::Hole }) {
-            const bool contour_side = side == TubeSide::Contour;
-            CAPTURE(i, contour_side);
-            const std::vector<int> insets = side_insets(layers[i], side);
-            REQUIRE(int(insets.size()) == walls);
-            CHECK(insets == wall_sequence_insets(wall_sequence, i == 0, walls - 1));
-        }
-    }
-}
-
-// The outer wall of a thin wall hole touches the contour's with nothing between them. The hole is printed first, so
-// the contour leans on it, unless the wall sequence puts the outer walls first.
-TEST_CASE("A thin wall hole is printed before the contour unless the outer walls go first", "[Perimeters]")
-{
-    const char       *wall_generator = GENERATE("classic", "arachne");
-    const std::string wall_sequence  = GENERATE("inner wall/outer wall", "outer wall/inner wall", "inner-outer-inner wall");
-    CAPTURE(wall_generator, wall_sequence);
-
-    DynamicPrintConfig config = tube_config(wall_generator, 3);
-    config.set_deserialize_strict("wall_sequence", wall_sequence);
-    Print print;
-    Model model;
-    round_tube(print, model, config, 1.);
-    const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, 1.);
-    REQUIRE(layers.size() == 10);
-
-    const TubeSide first = wall_sequence == "outer wall/inner wall" ? TubeSide::Contour : TubeSide::Hole;
-    for (size_t i = 0; i < layers.size(); ++ i) {
-        CAPTURE(i);
-        REQUIRE(layers[i].size() == 2);
-        REQUIRE(layers[i][0].side != layers[i][1].side);
-        CHECK(layers[i].front().side == first);
-    }
-}
-
-// A 1.5mm tube wall leaves Inner/Outer/Inner no third wall to sandwich, only the inner wall Arachne lays in the middle
-// for both sides, or Classic's gap fill. Past the first layer it prints the hole first, then the contour, then the
-// middle.
-TEST_CASE("Inner/Outer/Inner prints the hole of a narrow tube wall first and the middle last", "[Perimeters]")
-{
-    const char *wall_generator = GENERATE("classic", "arachne");
-    CAPTURE(wall_generator);
-
-    DynamicPrintConfig config = tube_config(wall_generator, 3);
-    config.set_deserialize_strict("wall_sequence", "inner-outer-inner wall");
-    Print print;
-    Model model;
-    round_tube(print, model, config, 1.5);
-    const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, 1.5);
-    REQUIRE(layers.size() == 10);
-
-    // Classic's gap fill is not a wall loop, and goes after the walls.
-    const std::string expected = std::string(wall_generator) == "arachne" ? "h0 c0 m1" : "h0 c0";
-    for (size_t i = 1; i < layers.size(); ++ i) {
-        CAPTURE(i);
-        CHECK(wall_order(layers[i]) == expected);
-    }
-}
-
-// The contour's walls run in the wall direction and the hole's against it, except that the walls of a thin wall
-// hole run with the contour, as does the inner wall Arachne shares between both sides of a 1.5mm tube wall.
-TEST_CASE("Tube walls run in the wall direction and hole walls against it", "[Perimeters]")
-{
-    const double      wall           = GENERATE(1.0, 1.5, 2.0, 3.0);
-    const char       *wall_generator = GENERATE("classic", "arachne");
-    const std::string wall_direction = GENERATE("ccw", "cw");
-    CAPTURE(wall, wall_generator, wall_direction);
-
-    DynamicPrintConfig config = tube_config(wall_generator, 3);
-    config.set_deserialize_strict("wall_direction", wall_direction);
-    Print print;
-    Model model;
-    round_tube(print, model, config, wall);
-    const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, wall);
-    REQUIRE(layers.size() == 10);
-
-    const bool thin_wall_hole = wall == 1.;
-    for (size_t i = 0; i < layers.size(); ++ i) {
-        CAPTURE(i);
-        REQUIRE(std::any_of(layers[i].begin(), layers[i].end(), [](const TubeLoop &loop) { return loop.side == TubeSide::Contour; }));
-        REQUIRE(std::any_of(layers[i].begin(), layers[i].end(), [](const TubeLoop &loop) { return loop.side == TubeSide::Hole; }));
-        for (const TubeLoop &loop : layers[i]) {
-            CAPTURE(int(loop.side), loop.inset);
-            CHECK(loop.ccw == (runs_with_contour(loop, thin_wall_hole) == (wall_direction == "ccw")));
-        }
-    }
-}
-
-// Reverse on even with no threshold reverses every wall of every other layer, or only the inner walls when it is
-// restricted to them, and leaves the order of the walls alone.
-TEST_CASE("Reverse on even reverses the tube walls of every other layer", "[Perimeters]")
-{
-    const double wall                  = GENERATE(1.0, 1.5, 3.0);
-    const char  *wall_generator        = GENERATE("classic", "arachne");
-    const bool   reverse_internal_only = GENERATE(false, true);
-    CAPTURE(wall, wall_generator, reverse_internal_only);
-
-    auto slice = [&](bool overhang_reverse) {
-        DynamicPrintConfig config = tube_config(wall_generator, 3);
-        config.set_deserialize_strict({
-            { "overhang_reverse",               overhang_reverse },
-            { "overhang_reverse_internal_only", reverse_internal_only },
-        });
-        Print print;
-        Model model;
-        round_tube(print, model, config, wall);
-        return tube_loops(print, wall);
-    };
-    const std::vector<std::vector<TubeLoop>> plain    = slice(false);
-    const std::vector<std::vector<TubeLoop>> reversed = slice(true);
-    REQUIRE(plain.size() == 10);
-    REQUIRE(reversed.size() == plain.size());
-
-    for (size_t i = 0; i < plain.size(); ++ i) {
-        CAPTURE(i);
-        REQUIRE(reversed[i].size() == plain[i].size());
-        for (size_t j = 0; j < plain[i].size(); ++ j) {
-            CAPTURE(j);
-            CHECK(reversed[i][j].side == plain[i][j].side);
-            CHECK(reversed[i][j].inset == plain[i][j].inset);
-            const bool flips = i % 2 == 1 && (! reverse_internal_only || plain[i][j].inset > 0);
-            CHECK(reversed[i][j].ccw == (plain[i][j].ccw != flips));
-        }
-    }
-}
-
-namespace {
-
-DynamicPrintConfig brim_tube_config(const char *wall_generator, const std::string &wall_sequence, const char *brim_type, double brim_width)
-{
-    DynamicPrintConfig config = tube_config(wall_generator, 3);
-    config.set_deserialize_strict({
-        { "wall_sequence", wall_sequence },
-        { "brim_type",     brim_type },
-        { "brim_width",    brim_width },
-    });
-    return config;
-}
-
-} // namespace
-
-// A brim against the outer walls makes the first layer print them first, whatever the wall sequence, so the brim runs
-// straight on into the outer wall: each side of the tube wall outside in, and the contour before a thin wall hole.
-// Brims that may leave the outer walls bare keep the wall sequence, and so do the layers above.
-TEST_CASE("A brim against the outer walls makes the first layer print them first", "[Perimeters]")
-{
-    struct Brim {
-        const char *type;
-        double      width;
-        bool        outer_walls_first;
-    };
-    const Brim brim = GENERATE(values<Brim>({
-        { "no_brim", 5., false }, { "inner_only", 5., false }, { "auto_brim", 5., false }, { "outer_only", 0., false },
-        { "outer_only", 5., true }, { "outer_and_inner", 5., true }, { "leading_edge_only", 5., true } }));
-    const double      wall           = GENERATE(1.0, 3.0);
-    const char       *wall_generator = GENERATE("classic", "arachne");
-    const std::string wall_sequence  = GENERATE("inner wall/outer wall", "inner-outer-inner wall");
-    CAPTURE(brim.type, brim.width, wall, wall_generator, wall_sequence);
-
-    Print print;
-    Model model;
-    round_tube(print, model, brim_tube_config(wall_generator, wall_sequence, brim.type, brim.width), wall);
-    const std::vector<std::vector<TubeLoop>> layers = tube_loops(print, wall);
-    REQUIRE(layers.size() == 10);
-
-    // The thin wall hole has its outer wall a side, the 3mm tube wall three walls a side.
-    const size_t walls = wall == 1. ? 1 : 3;
-    for (const size_t i : { size_t(0), size_t(1) }) {
-        const bool outer_walls_first = brim.outer_walls_first && i == 0;
-        for (const TubeSide side : { TubeSide::Contour, TubeSide::Hole }) {
-            const bool contour_side = side == TubeSide::Contour;
-            CAPTURE(i, contour_side);
-            const std::vector<int> insets = side_insets(layers[i], side);
-            REQUIRE(insets.size() == walls);
-            CHECK(insets == wall_sequence_insets(outer_walls_first ? "outer wall/inner wall" : wall_sequence, i == 0, int(walls) - 1));
-        }
-        if (wall == 1.)
-            CHECK(layers[i].front().side == (outer_walls_first ? TubeSide::Contour : TubeSide::Hole));
-    }
-}
-
-// Changing the brim of a sliced print regenerates the walls when the first layer's wall order changes with it, so
-// the print gets the walls a slice from scratch with the new brim gets.
-TEST_CASE("Changing the brim updates the wall order of the first layer", "[Perimeters]")
-{
-    struct BrimChange {
-        const char *from_type;
-        double      from_width;
-        const char *to_type;
-        double      to_width;
-    };
-    const BrimChange change = GENERATE(values<BrimChange>({
-        { "outer_only", 0., "outer_only", 5. }, { "outer_only", 5., "outer_only", 0. },
-        { "no_brim", 5., "outer_and_inner", 5. }, { "outer_and_inner", 5., "inner_only", 5. } }));
-    const char *wall_generator = GENERATE("classic", "arachne");
-    CAPTURE(change.from_type, change.from_width, change.to_type, change.to_width, wall_generator);
-
-    const std::string wall_sequence = "inner wall/outer wall";
-    Print print;
-    Model model;
-    round_tube(print, model, brim_tube_config(wall_generator, wall_sequence, change.from_type, change.from_width), 3.);
-    const std::string before = wall_order(tube_loops(print, 3.).front());
-    print.apply(model, brim_tube_config(wall_generator, wall_sequence, change.to_type, change.to_width));
-    print.process();
-    const std::string after = wall_order(tube_loops(print, 3.).front());
-
-    Print fresh_print;
-    Model fresh_model;
-    round_tube(fresh_print, fresh_model, brim_tube_config(wall_generator, wall_sequence, change.to_type, change.to_width), 3.);
-    const std::string fresh = wall_order(tube_loops(fresh_print, 3.).front());
-
-    // The change does turn the first layer around.
-    REQUIRE(before != fresh);
-    CHECK(after == fresh);
-}

tests/fff_print/test_print.cpp

@@ -735,65 +735,6 @@ TEST_CASE("Custom G-code placeholders are substituted", "[Print]")
     CHECK(per_layer.find(";Layer:399 ") != std::string::npos);
 }
 
-// The final print statistics are known only after the whole G-code is generated, yet every custom G-code,
-// the file header included, gets the same values as filename_format.
-TEST_CASE("Print statistics in custom G-code match the final print statistics", "[Print][Regression]")
-{
-    const std::string gcode_key = GENERATE(as<std::string>{}, "file_start_gcode", "machine_start_gcode", "machine_end_gcode");
-    // Bambu printers use another tag table and G-code layout.
-    const bool is_bbl = GENERATE(false, true);
-    CAPTURE(gcode_key, is_bbl);
-
-    const std::vector<std::string> number_keys = { "total_weight", "used_filament", "total_cost", "total_wipe_tower_cost",
-                                                   "total_wipe_tower_filament" };
-    const std::vector<std::string> time_keys   = { "print_time", "normal_print_time", "silent_print_time" };
-    std::string                    templ;
-    for (const std::vector<std::string> *keys : { &number_keys, &time_keys })
-        for (const std::string &key : *keys)
-            templ += "; stat " + key + "={" + key + "}\n";
-
-    DynamicPrintConfig config = DynamicPrintConfig::full_print_config();
-    config.set_deserialize_strict({
-        { gcode_key,          templ },
-        { "filament_density", "1.25" },
-        { "filament_cost",    "20" },
-        { "time_cost",        "2" },
-    });
-    Print print;
-    Model model;
-    init_print({ cube(20) }, print, model, config);
-    print.is_BBL_printer() = is_bbl;
-
-    std::string gcode;
-    REQUIRE_NOTHROW(gcode = Slic3r::Test::gcode(print));
-
-    // Match whole lines only: the config block repeats the template on a single line, and Bambu printers
-    // write that block before the start G-code.
-    const std::string lines    = "\n" + gcode;
-    const auto        value_of = [&lines](const std::string &key) {
-        const std::string prefix = "\n; stat " + key + "=";
-        const size_t      start  = lines.find(prefix);
-        REQUIRE(start != std::string::npos);
-        const size_t begin = start + prefix.size();
-        return lines.substr(begin, lines.find('\n', begin) - begin);
-    };
-    // The same statistics filename_format is expanded with.
-    DynamicConfig stats = print.print_statistics().config();
-    // A 20mm cube with filament_density 1.25 weighs something, unlike the running extruded_weight_total in the header.
-    CHECK(stats.opt_float("total_weight") > 0.);
-    for (const std::string &key : number_keys) {
-        CAPTURE(key);
-        const std::string value = value_of(key);
-        REQUIRE(value.find('@') == std::string::npos);
-        // Written with two decimals.
-        CHECK_THAT(std::stod(value), Catch::Matchers::WithinAbs(stats.opt_float(key), 0.006));
-    }
-    for (const std::string &key : time_keys) {
-        CAPTURE(key);
-        CHECK(value_of(key) == stats.opt_string(key));
-    }
-}
-
 TEST_CASE("export_gcode writes G-code without a result pointer", "[Print][export_gcode]")
 {
     Print print;

tests/libslic3r/test_3mf.cpp

@@ -505,28 +505,6 @@ TEST_CASE("A project whose components reference themselves fails to load", "[3mf
     REQUIRE_FALSE(loaded);
 }
 
-TEST_CASE("A project in the 2.4.x layout keeps auto drop off from its build item", "[3mf][Regression]")
-{
-    // 2.4.x wrote auto_drop on the build item and left it off the object, so the object is re-laid out here.
-    ScopedTemporaryFile temp(".3mf");
-    {
-        Model        model;
-        ModelObject* object = model.add_object();
-        object->add_volume(make_cube(10., 10., 10.));
-        object->add_instance();
-        object->auto_drop = false;
-        store_project(model, temp.string(), SaveStrategy::Zip64 | SaveStrategy::Silence);
-    }
-    REQUIRE(replace_in_3mf_entry(temp.string(), "model_settings.config", " auto_drop=\"0\"", ""));
-    REQUIRE(replace_in_3mf_entry(temp.string(), "3dmodel.model", "printable=\"1\"/>", "printable=\"1\" auto_drop=\"0\"/>"));
-
-    ScopedTemporaryDir backup_dir("orca_auto_drop_dst");
-    Model              model;
-    REQUIRE(load_project(temp.string(), model, backup_dir));
-    REQUIRE(model.objects.size() == 1);
-    CHECK_FALSE(model.objects.front()->auto_drop);
-}
-
 TEST_CASE("An object loads up to the component reference budget and fails past it", "[3mf][Regression]")
 {
     // The importer queues at most 100000 component references per object. Every reference besides the

tests/libslic3r/test_miniz_extension.cpp

@@ -18,7 +18,6 @@
 #include <fstream>
 #include <ios>
 #include <iterator>
-#include <libslic3r/Utils.hpp>
 #include <miniz.h>
 #include <string>
 #include <utility>
@@ -177,55 +176,6 @@ TEST_CASE("Confined extraction writes nothing outside the target for Windows-spe
     CHECK(list_dir(tmp.path()) == std::vector<std::string>{"bundle.zip", "cache"});
 }
 
-TEST_CASE("Confined extraction writes files under a target path longer than MAX_PATH", "[MinizExtension]")
-{
-    ScopedTemporaryDir tmp;
-    const fs::path     zip_file = tmp.path() / "bundle.zip";
-    // Directory entries are explicit: extract_archive_confined recreates directories only for them.
-    write_zip(zip_file, {{"vendor/", ""}, {"vendor/machine/", ""}, {"vendor.json", "{\"a\":1}"},
-                         {"vendor/machine/printer.json", "{\"b\":2}"}});
-
-    // One 240-char component keeps every name below the NTFS 255 limit while pushing the full
-    // target path past the 260-char MAX_PATH the Win32 APIs enforce when LongPathsEnabled is off.
-    const fs::path target = tmp.path() / std::string(240, 'd');
-    REQUIRE(target.string().size() > 260);
-    fs::create_directories(extended_path(target));
-
-    REQUIRE(extract_archive_confined(zip_file.string(), target.string()));
-    // Verify through extended-length paths, otherwise the checks themselves are bounded by MAX_PATH.
-    CHECK(fs::is_directory(extended_path(target / "vendor")));
-    CHECK(read_file(extended_path(target / "vendor.json")) == "{\"a\":1}");
-    CHECK(read_file(extended_path(target / "vendor" / "machine" / "printer.json")) == "{\"b\":2}");
-
-    // The temporary dir guard cannot remove a deep tree on Windows, so drop it here.
-    boost::system::error_code ec;
-    fs::remove_all(extended_path(target), ec);
-    CHECK_FALSE(ec);
-}
-
-TEST_CASE("A zip archive under a path longer than MAX_PATH can be written and read", "[MinizExtension]")
-{
-    ScopedTemporaryDir tmp;
-
-    // Create the long directory with the extended-length path, then exercise the archive
-    // reader/writer against an archive whose own path is past MAX_PATH.
-    const fs::path long_dir = tmp.path() / std::string(240, 'z');
-    fs::create_directories(extended_path(long_dir));
-    const fs::path zip_file = long_dir / "bundle.zip";
-    REQUIRE(zip_file.string().size() > 260);
-
-    write_zip(zip_file, {{"vendor.json", "{\"a\":1}"}});
-
-    const fs::path target = tmp.path() / "out";
-    fs::create_directories(target);
-    REQUIRE(extract_archive_confined(zip_file.string(), target.string()));
-    CHECK(read_file(target / "vendor.json") == "{\"a\":1}");
-
-    boost::system::error_code ec;
-    fs::remove_all(extended_path(long_dir), ec);
-    CHECK_FALSE(ec);
-}
-
 #ifndef _WIN32
 TEST_CASE("Confined extraction replaces a symlink at the destination instead of writing through it", "[MinizExtension]")
 {

tests/libslic3r/test_preset_bundle_loading.cpp

@@ -985,37 +985,6 @@ TEST_CASE("A user filament synced to the cloud and back keeps its values and uns
     }
 }
 
-TEST_CASE("A project filament storing one value for a per-variant key applies it to every variant", "[Preset][Bundle][Regression]")
-{
-    PresetCollection filaments(Preset::TYPE_FILAMENT, Preset::filament_options(),
-                               static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()));
-    Preset &parent = add_inmemory_preset(filaments, "Parent Filament");
-    parent.config.set_key_value("filament_extruder_variant", new ConfigOptionStrings({"Direct Drive Standard", "Direct Drive High Flow"}));
-    parent.config.set_key_value("adaptive_pressure_advance_model", new ConfigOptionStrings({"parent standard", "parent high flow"}));
-    parent.config.set_deserialize_strict("pressure_advance", "0.02,0.03");
-    parent.is_system = true;
-
-    // A filament saved before these keys became per-variant lists both variants but stores each key once.
-    const std::string model = "0.025,15.6,5000";
-    DynamicPrintConfig config;
-    config.set_key_value(BBL_JSON_KEY_INHERITS, new ConfigOptionString("Parent Filament"));
-    config.set_key_value("filament_extruder_variant", new ConfigOptionStrings({"Direct Drive Standard", "Direct Drive High Flow"}));
-    config.set_key_value("adaptive_pressure_advance_model", new ConfigOptionStrings({model}));
-    config.set_deserialize_strict("pressure_advance", "0.016");
-    auto embedded                 = std::make_unique<Preset>(Preset::TYPE_FILAMENT, "Project Filament", false);
-    embedded->config              = std::move(config);
-    embedded->is_project_embedded = true;
-
-    std::vector<Preset *>      project_presets{embedded.get()};
-    PresetsConfigSubstitutions substitutions;
-    filaments.load_project_embedded_presets(project_presets, PRESET_FILAMENT_NAME, substitutions, ForwardCompatibilitySubstitutionRule::Disable);
-
-    const Preset *loaded = filaments.find_preset("Project Filament");
-    REQUIRE(loaded != nullptr);
-    CHECK(loaded->config.option<ConfigOptionStrings>("adaptive_pressure_advance_model")->values == std::vector<std::string>{model, model});
-    check_double_vector(loaded->config.option<ConfigOptionFloats>("pressure_advance")->values, {0.016, 0.016});
-}
-
 TEST_CASE("Repeated loads of a user preset directory produce the same presets", "[Preset][Bundle]")
 {
     ScopedTemporaryDir temp_dir;
@@ -1219,24 +1188,6 @@ TEST_CASE("find_preset2 auto-matches removed Generic vendor profiles to the libr
     CHECK(bundle.filaments.find_preset2("BrandX Generic PETG", /*auto_match=*/true) == nullptr);
 }
 
-TEST_CASE("The selected preset is its own base when its parent is not loaded", "[Preset]")
-{
-    PresetCollection printers(Preset::TYPE_PRINTER, Preset::printer_options(),
-                              static_cast<const PrintRegionConfig &>(FullPrintConfig::defaults()));
-    add_inmemory_preset(printers, "Printer");
-    add_inmemory_preset(printers, "User Printer", "Printer");
-    add_inmemory_preset(printers, "Orphan Printer", "Uninstalled Vendor Printer");
-
-    printers.select_preset_by_name("User Printer", true);
-    REQUIRE(printers.get_selected_preset_name() == "User Printer");
-    CHECK(printers.get_selected_preset_base().name == "Printer");
-
-    printers.select_preset_by_name("Orphan Printer", true);
-    REQUIRE(printers.get_selected_preset_name() == "Orphan Printer");
-    REQUIRE(printers.get_preset_base(printers.get_selected_preset()) == nullptr);
-    CHECK(printers.get_selected_preset_base().name == "Orphan Printer");
-}
-
 TEST_CASE("Renamed parent is normalized into a loaded preset's inherits", "[Preset][Rename]")
 {
     ScopedTemporaryDir   temp_dir;

tests/libslic3r/test_utils.cpp

@@ -521,49 +521,3 @@ TEST_CASE("ascii_iequals compares ASCII letters regardless of case", "[Utils]")
     CHECK_FALSE(ascii_iequals("[", "{"));
     CHECK_FALSE(ascii_iequals("@", "`"));
 }
-
-TEST_CASE("extended_path turns a Windows path into its long-path form", "[Utils]") {
-#ifdef _WIN32
-    namespace fs = boost::filesystem;
-
-    SECTION("a normal absolute drive path is prefixed") {
-        CHECK(extended_path(fs::path(R"(C:\models\model.3mf)")).wstring() == LR"(\\?\C:\models\model.3mf)");
-    }
-    SECTION("separators are made native") {
-        CHECK(extended_path(fs::path("C:/models/model.3mf")).wstring() == LR"(\\?\C:\models\model.3mf)");
-    }
-    SECTION("dot segments are collapsed before prefixing") {
-        // The "\\?\" prefix disables Win32 normalisation, so "." and ".." must be gone beforehand.
-        CHECK(extended_path(fs::path(R"(C:\models\..\model.3mf)")).wstring() == LR"(\\?\C:\model.3mf)");
-    }
-    SECTION("a trailing separator is dropped, not turned into a dot element") {
-        CHECK(extended_path(fs::path(R"(C:\models\)")).wstring() == LR"(\\?\C:\models)");
-    }
-    SECTION("a UNC path becomes an extended UNC path") {
-        CHECK(extended_path(fs::path(R"(\\server\share\model.3mf)")).wstring() == LR"(\\?\UNC\server\share\model.3mf)");
-    }
-    SECTION("an already extended path is returned unchanged") {
-        const fs::path extended(R"(\\?\C:\models\model.3mf)");
-        CHECK(extended_path(extended) == extended);
-    }
-    SECTION("a device path is returned unchanged") {
-        const fs::path device(R"(\\.\C:\models\model.3mf)");
-        CHECK(extended_path(device) == device);
-    }
-    SECTION("a bare device path without a root directory is returned unchanged") {
-        // Not "absolute" by Boost's rules, so it must be recognized before absolutizing.
-        const fs::path device(R"(\\.\PhysicalDrive0)");
-        CHECK(extended_path(device) == device);
-    }
-    SECTION("a relative path is completed against the working directory") {
-        const fs::path result = extended_path(fs::path("model.3mf"));
-        CHECK(result.wstring().rfind(L"\\\\?\\", 0) == 0);
-        CHECK(result.filename() == fs::path("model.3mf"));
-    }
-#else
-    SECTION("non-Windows returns the path unchanged") {
-        const boost::filesystem::path p = boost::filesystem::temp_directory_path() / "model.3mf";
-        CHECK(extended_path(p) == p);
-    }
-#endif
-}

tests/slic3rutils/CMakeLists.txt

@@ -6,7 +6,7 @@ add_executable(${_TEST_NAME}_tests
     test_creality_cfs_match.cpp
     test_dev_mapping.cpp
     test_device_access.cpp
-    test_moonraker_printer_agent.cpp
+    test_moonraker_discovery.cpp
     test_network_discovery.cpp
     test_filament_bitmap_utils.cpp
     test_colour_picker_field.cpp

tests/slic3rutils/test_imgui_wrapper.cpp

@@ -1,7 +1,6 @@
-// How ImGuiWrapper turns wx mouse events into ImGui input, and when it reports that ImGui owns a key.
+// How ImGuiWrapper turns wx mouse events into ImGui input. ImGuiWrapper lives in libslic3r_gui; this is
-// ImGuiWrapper lives in libslic3r_gui; this is the suite that links it. Same Windows include prologue
+// the suite that links it. Same Windows include prologue as test_texture_color_palette.cpp (wx pulls in
-// as test_texture_color_palette.cpp (wx pulls in <windows.h>; keep WIN32_LEAN_AND_MEAN / NOMINMAX
+// <windows.h>; keep WIN32_LEAN_AND_MEAN / NOMINMAX ahead of it).
-// ahead of it).
 #ifdef WIN32
     #ifndef WIN32_LEAN_AND_MEAN
         #define WIN32_LEAN_AND_MEAN
@@ -18,15 +17,12 @@
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 #include <imgui/imgui.h>
-#include <imgui/imgui_internal.h>
 #include <wx/event.h>
 
 #include "slic3r/GUI/ImGuiWrapper.hpp"
-#include "slic3r/GUI/KeyChord.hpp"
 
 using Catch::Matchers::WithinAbs;
 using Slic3r::GUI::ImGuiWrapper;
-using Slic3r::GUI::KeyChord;
 
 namespace {
 
@@ -45,45 +41,6 @@ float wheel_after(int rotation, wxMouseWheelAxis axis)
     return ImGui::GetIO().MouseWheel;
 }
 
-// Runs ImGui frames without OpenGL by building the font atlas on the CPU.
-struct ImGuiFrames
-{
-    ImGuiWrapper imgui;
-
-    ImGuiFrames()
-    {
-        imgui.set_display_size(800.f, 600.f);
-        unsigned char* pixels = nullptr;
-        int            width = 0, height = 0;
-        ImGui::GetIO().Fonts->GetTexDataAsRGBA32(&pixels, &width, &height);
-    }
-
-    template<class Draw> void frame(Draw draw)
-    {
-        ImGui::NewFrame();
-        draw();
-        ImGui::EndFrame();
-    }
-
-    // SetKeyboardFocusHere() activates the field in the next frame that draws it.
-    void draw_input(bool focus)
-    {
-        ImGui::Begin("window");
-        if (focus)
-            ImGui::SetKeyboardFocusHere();
-        ImGui::InputText("##text", text, sizeof(text));
-        ImGui::End();
-    }
-
-    char text[16] = "";
-};
-
-void draw_modal()
-{
-    if (ImGui::BeginPopupModal("modal"))
-        ImGui::EndPopup();
-}
-
 } // namespace
 
 TEST_CASE("a vertical wheel event steps ImGui's wheel in its own direction", "[ImGuiWrapper]")
@@ -102,62 +59,3 @@ TEST_CASE("a wheel event with no rotation or on the horizontal axis does not ste
     }));
     CHECK_THAT(wheel_after(rotation, axis), WithinAbs(0.0, 0.0));
 }
-
-TEST_CASE("an InputText counts as active only while it holds the keyboard", "[ImGuiWrapper]")
-{
-    ImGuiFrames f;
-    f.frame([&] { f.draw_input(false); });
-    CHECK_FALSE(f.imgui.text_input_active());
-
-    f.frame([&] { f.draw_input(true); });
-    f.frame([&] { f.draw_input(false); });
-    CHECK(f.imgui.text_input_active());
-
-    f.frame([] {});
-    f.frame([] {});
-    CHECK_FALSE(f.imgui.text_input_active());
-}
-
-TEST_CASE("a modal counts as open from its first frame until a frame no longer draws it", "[ImGuiWrapper]")
-{
-    ImGuiFrames f;
-    CHECK_FALSE(f.imgui.modal_popup_open());
-
-    f.frame([] {
-        ImGui::OpenPopup("modal");
-        draw_modal();
-    });
-    CHECK(f.imgui.modal_popup_open());
-
-    // A frame opened by input, before anything is drawn in it.
-    ImGui::NewFrame();
-    CHECK(f.imgui.modal_popup_open());
-    draw_modal();
-    ImGui::EndFrame();
-    CHECK(f.imgui.modal_popup_open());
-
-    // A frame that no longer draws it, as when its canvas is hidden.
-    f.frame([] {});
-    REQUIRE(ImGui::GetTopMostPopupModal() != nullptr);
-    CHECK_FALSE(f.imgui.modal_popup_open());
-}
-
-TEST_CASE("ImGui owns every key under a modal and text-editing keys in an active InputText", "[ImGuiWrapper]")
-{
-    ImGuiFrames    f;
-    const KeyChord letter{ 'A' };
-    const KeyChord save{ 'S', wxMOD_CONTROL };
-    CHECK_FALSE(f.imgui.owns_key(letter));
-    CHECK_FALSE(f.imgui.owns_key(save));
-
-    f.frame([&] { f.draw_input(true); });
-    f.frame([&] { f.draw_input(false); });
-    CHECK(f.imgui.owns_key(letter));
-    CHECK_FALSE(f.imgui.owns_key(save));
-
-    f.frame([] {
-        ImGui::OpenPopup("modal");
-        draw_modal();
-    });
-    CHECK(f.imgui.owns_key(save));
-}

tests/slic3rutils/test_moonraker_discovery.cpp

@@ -0,0 +1,51 @@
+#include <catch2/catch_test_macros.hpp>
+
+#include <string>
+#include "slic3r/Utils/MoonrakerPrinterAgent.hpp"
+
+using namespace Slic3r;
+
+namespace {
+
+class DiscoveryAgent : public MoonrakerPrinterAgent
+{
+public:
+    using MoonrakerPrinterAgent::MoonrakerPrinterAgent;
+    using MoonrakerPrinterAgent::device_info;
+    mutable unsigned fetch_count = 0;
+
+protected:
+    bool fetch_device_info(const std::string&, const std::string&, MoonrakerDeviceInfo& info, std::string&) const override
+    {
+        ++fetch_count;
+        info.dev_name = "Test printer";
+        return true;
+    }
+};
+
+} // namespace
+
+TEST_CASE("Moonraker discovery waits for a complete device identity", "[MoonrakerDiscovery]")
+{
+    DiscoveryAgent agent("");
+    unsigned announcements = 0;
+    nlohmann::json announcement;
+    agent.set_on_ssdp_msg_fn([&](std::string payload) {
+        ++announcements;
+        announcement = nlohmann::json::parse(payload);
+    });
+
+    agent.start_discovery(true, false);
+    REQUIRE(announcements == 0);
+    REQUIRE(agent.fetch_count == 0);
+
+    agent.device_info.dev_id = "127.0.0.1:7125";
+    agent.device_info.dev_ip = agent.device_info.dev_id;
+    agent.device_info.base_url = "http://127.0.0.1:7125";
+    agent.start_discovery(true, false);
+    REQUIRE(announcements == 1);
+    REQUIRE(agent.fetch_count == 1);
+    REQUIRE(announcement.at("dev_id") == agent.device_info.dev_id);
+    REQUIRE(announcement.at("dev_ip") == agent.device_info.dev_ip);
+    REQUIRE(announcement.at("dev_name") == "Test printer");
+}

tests/slic3rutils/test_moonraker_printer_agent.cpp

@@ -1,589 +0,0 @@
-#include <catch2/catch_message.hpp>
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/generators/catch_generators.hpp>
-
-#include <atomic>
-#include <chrono>
-#include <condition_variable>
-#include <cstddef>
-#include <functional>
-#include <future>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-#include <boost/asio/buffer.hpp>
-#include <boost/asio/io_context.hpp>
-#include <boost/asio/ip/address.hpp>
-#include <boost/asio/ip/tcp.hpp>
-#include <boost/beast/core/error.hpp>
-#include <boost/beast/core/flat_buffer.hpp>
-#include <boost/beast/http/message.hpp>
-#include <boost/beast/http/read.hpp>
-#include <boost/beast/http/status.hpp>
-#include <boost/beast/http/string_body.hpp>
-#include <boost/beast/http/write.hpp>
-#include <boost/beast/websocket/error.hpp>
-#include <boost/beast/websocket/rfc6455.hpp>
-#include <boost/beast/websocket/stream.hpp>
-#include <nlohmann/json.hpp>
-
-#include "slic3r/Utils/IPrinterAgent.hpp"
-#include "slic3r/Utils/MoonrakerPrinterAgent.hpp"
-
-using namespace Slic3r;
-
-namespace {
-
-namespace beast     = boost::beast;
-namespace http      = beast::http;
-namespace websocket = beast::websocket;
-namespace net       = boost::asio;
-using tcp           = net::ip::tcp;
-using namespace std::chrono_literals;
-
-class DiscoveryAgent : public MoonrakerPrinterAgent
-{
-public:
-    using MoonrakerPrinterAgent::MoonrakerPrinterAgent;
-    using MoonrakerPrinterAgent::device_info;
-    mutable unsigned fetch_count = 0;
-
-protected:
-    bool fetch_device_info(const std::string&, const std::string&, MoonrakerDeviceInfo& info, std::string&) const override
-    {
-        ++fetch_count;
-        info.dev_name = "Test printer";
-        return true;
-    }
-};
-
-class StreamAgent : public MoonrakerPrinterAgent
-{
-public:
-    using MoonrakerPrinterAgent::MoonrakerPrinterAgent;
-    using MoonrakerPrinterAgent::start_status_stream;
-    using MoonrakerPrinterAgent::stop_status_stream;
-    using MoonrakerPrinterAgent::ws_timings;
-
-protected:
-    bool init_device_info(
-        const std::string& dev_id, const std::string& dev_ip, const std::string&, const std::string&, bool, const std::string& port) override
-    {
-        device_info          = MoonrakerDeviceInfo{};
-        device_info.dev_id   = dev_id;
-        device_info.base_url = "http://" + dev_ip + ":" + port;
-        return true;
-    }
-
-    bool fetch_device_info(const std::string&, const std::string&, MoonrakerDeviceInfo& info, std::string&) const override
-    {
-        info.dev_name = "Test printer";
-        return true;
-    }
-};
-
-enum class Behavior {
-    SilentBeforeHandshake,     // Accepts the connection and never answers
-    Silent,                    // Completes the upgrade, then never reads or sends
-    AnswersPings,              // Reports a status, then answers pings and sends nothing else
-    AnswersPingsWithoutStatus, // Answers pings but never reports a status
-    Chatters,                  // Reports a status, then answers pings and sends notifications that carry no status
-    HangsUp,                   // Reports a status, then closes the websocket
-    HangsUpWithoutAnswer,      // Closes the websocket without sending anything
-    IgnoresClose,              // Reports Klippy disconnected, then never answers the close
-    StallsObjectList,          // Never answers the stream's object list request
-    StallsStatusQuery,         // Never answers HTTP requests until released, then hangs up on them
-};
-
-class FakePrinter
-{
-public:
-    explicit FakePrinter(Behavior behavior) : m_behavior(behavior)
-    {
-        m_accept_thread = std::thread([this] { accept_loop(); });
-    }
-
-    ~FakePrinter()
-    {
-        release();
-        m_stopping = true;
-        // Wakes the blocking accept.
-        tcp::socket wake{m_accept_ioc};
-        beast::error_code ec;
-        wake.connect(m_acceptor.local_endpoint(), ec);
-        m_accept_thread.join();
-        for (std::thread& connection : m_connections)
-            connection.join();
-    }
-
-    std::string host() const { return "127.0.0.1"; }
-    std::string port() const { return std::to_string(m_acceptor.local_endpoint().port()); }
-    std::string base_url() const { return "http://" + host() + ":" + port(); }
-
-    // A connection is ready once it reaches the state its behavior waits in.
-    bool wait_for_ready_connections(int count, std::chrono::milliseconds timeout = 10s)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        return m_changed.wait_for(lock, timeout, [&] { return m_ready >= count; });
-    }
-
-    bool wait_for_http_requests(int count)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        return m_changed.wait_for(lock, 10s, [&] { return m_http_requests >= count; });
-    }
-
-    // Waits until the printer, once released, has hung up on `count` stalled HTTP requests.
-    bool wait_for_http_hang_ups(int count)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        return m_changed.wait_for(lock, 10s, [&] { return m_http_hung_up >= count; });
-    }
-
-    int close_frames()
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        return m_close_frames;
-    }
-
-    // The printer answers a close frame before its own read completes, so the agent's stop can return first.
-    bool wait_for_close_frames(int count)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        return m_changed.wait_for(lock, 10s, [&] { return m_close_frames >= count; });
-    }
-
-    // Hangs up every connection that is waiting.
-    void release()
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_released = true;
-        m_changed.notify_all();
-    }
-
-private:
-    void accept_loop()
-    {
-        for (;;) {
-            // Each connection gets its own io_context, so a connection that runs one never runs another's handlers.
-            auto ioc = std::make_unique<net::io_context>();
-            tcp::socket socket{*ioc};
-            beast::error_code ec;
-            m_acceptor.accept(socket, ec);
-            if (ec || m_stopping)
-                return;
-            m_connections.emplace_back(
-                [this, ioc = std::move(ioc), socket = std::move(socket)]() mutable { serve(*ioc, std::move(socket)); });
-        }
-    }
-
-    void serve(net::io_context& ioc, tcp::socket socket)
-    {
-        if (m_behavior == Behavior::SilentBeforeHandshake) {
-            mark_ready();
-            wait_for_release();
-            return;
-        }
-
-        beast::flat_buffer buffer;
-        http::request<http::string_body> request;
-        beast::error_code ec;
-        http::read(socket, buffer, request, ec);
-        if (ec)
-            return;
-        // The agent also queries the printer's status and object list over plain HTTP.
-        if (!websocket::is_upgrade(request)) {
-            serve_http(socket, request);
-            return;
-        }
-
-        websocket::stream<tcp::socket> ws{std::move(socket)};
-        ws.accept(request, ec);
-        // Without its object list the stream never sends the subscribe request.
-        const int requests = m_behavior == Behavior::StallsObjectList ? 1 : 2;
-        for (int i = 0; i < requests && !ec; ++i) {
-            beast::flat_buffer message;
-            ws.read(message, ec);
-        }
-        if (!ec && (m_behavior == Behavior::AnswersPings || m_behavior == Behavior::Chatters || m_behavior == Behavior::HangsUp)) {
-            const std::string status =
-                nlohmann::json{{"jsonrpc", "2.0"}, {"id", 1}, {"result", {{"status", {{"print_stats", {{"state", "standby"}}}}}}}}.dump();
-            ws.write(net::buffer(status), ec);
-        }
-        if (ec)
-            return;
-
-        switch (m_behavior) {
-        case Behavior::AnswersPings:
-        case Behavior::AnswersPingsWithoutStatus:
-        case Behavior::Chatters:
-            mark_ready();
-            answer_pings(ioc, ws, m_behavior == Behavior::Chatters);
-            break;
-        case Behavior::HangsUp:
-        case Behavior::HangsUpWithoutAnswer:
-            ws.close(websocket::close_code::normal, ec);
-            mark_ready();
-            break;
-        case Behavior::IgnoresClose: {
-            const std::string notification = nlohmann::json{{"jsonrpc", "2.0"}, {"method", "notify_klippy_disconnected"}}.dump();
-            ws.write(net::buffer(notification), ec);
-            mark_ready();
-            wait_for_release();
-            break;
-        }
-        case Behavior::StallsObjectList: answer_pings(ioc, ws, false); break;
-        default: mark_ready(); wait_for_release();
-        }
-    }
-
-    void serve_http(tcp::socket& socket, const http::request<http::string_body>& request)
-    {
-        {
-            std::lock_guard<std::mutex> lock(m_mutex);
-            ++m_http_requests;
-            m_changed.notify_all();
-        }
-        if (m_behavior == Behavior::StallsObjectList) {
-            mark_ready();
-            wait_for_release();
-            return;
-        }
-        if (m_behavior == Behavior::StallsStatusQuery) {
-            wait_for_release();
-            beast::error_code ec;
-            socket.close(ec);
-            std::lock_guard<std::mutex> lock(m_mutex);
-            ++m_http_hung_up;
-            m_changed.notify_all();
-            return;
-        }
-        http::response<http::string_body> response{http::status::not_found, request.version()};
-        response.prepare_payload();
-        beast::error_code ec;
-        http::write(socket, response, ec);
-    }
-
-    // Keeps a read pending, which answers pings, until released or closed, and with `chatter` also sends a notification every 50 ms.
-    void answer_pings(net::io_context& ioc, websocket::stream<tcp::socket>& ws, bool chatter)
-    {
-        const std::string notification = nlohmann::json{{"jsonrpc", "2.0"},
-                                                        {"method", "notify_proc_stat_update"},
-                                                        {"params", nlohmann::json::array({nlohmann::json::object()})}}
-                                             .dump();
-        beast::flat_buffer message;
-        bool reading                    = true;
-        bool writing                    = false;
-        std::function<void()> read_next = [&] {
-            ws.async_read(message, [&](beast::error_code ec, std::size_t) {
-                message.clear();
-                if (ec == websocket::error::closed) {
-                    std::lock_guard<std::mutex> lock(m_mutex);
-                    ++m_close_frames;
-                    m_changed.notify_all();
-                }
-                if (ec)
-                    reading = false;
-                else
-                    read_next();
-            });
-        };
-        read_next();
-
-        auto next_notification = std::chrono::steady_clock::now();
-        while (reading && !wait_for_release(10ms)) {
-            if (chatter && !writing && std::chrono::steady_clock::now() >= next_notification) {
-                writing = true;
-                next_notification += 50ms;
-                ws.async_write(net::buffer(notification), [&](beast::error_code, std::size_t) { writing = false; });
-            }
-            ioc.restart();
-            ioc.run_for(20ms);
-        }
-        beast::error_code ignored;
-        ws.next_layer().close(ignored);
-        while (reading || writing) {
-            ioc.restart();
-            ioc.run_for(20ms);
-        }
-    }
-
-    void mark_ready()
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        ++m_ready;
-        m_changed.notify_all();
-    }
-
-    void wait_for_release()
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        m_changed.wait(lock, [this] { return m_released; });
-    }
-
-    bool wait_for_release(std::chrono::milliseconds timeout)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        return m_changed.wait_for(lock, timeout, [this] { return m_released; });
-    }
-
-    const Behavior m_behavior;
-    net::io_context m_accept_ioc;
-    tcp::acceptor m_acceptor{m_accept_ioc, {net::ip::make_address("127.0.0.1"), 0}};
-    std::atomic<bool> m_stopping{false};
-    std::thread m_accept_thread;
-    std::vector<std::thread> m_connections;
-    std::mutex m_mutex;
-    std::condition_variable m_changed;
-    int m_ready         = 0;
-    int m_http_requests = 0;
-    int m_http_hung_up  = 0;
-    int m_close_frames  = 0;
-    bool m_released     = false;
-};
-
-// Records when the agent dispatches a status report.
-class Reports
-{
-public:
-    void attach(StreamAgent& agent)
-    {
-        agent.set_on_local_message_fn([this](std::string, std::string) {
-            std::lock_guard<std::mutex> lock(m_mutex);
-            m_times.push_back(std::chrono::steady_clock::now());
-            m_changed.notify_all();
-        });
-    }
-
-    bool wait_for(std::size_t count)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        return m_changed.wait_for(lock, 10s, [&] { return m_times.size() >= count; });
-    }
-
-    std::vector<std::chrono::steady_clock::time_point> times()
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        return m_times;
-    }
-
-private:
-    std::mutex m_mutex;
-    std::condition_variable m_changed;
-    std::vector<std::chrono::steady_clock::time_point> m_times;
-};
-
-// A printer and a stream agent connected to it.
-struct StreamFixture
-{
-    explicit StreamFixture(Behavior behavior) : printer(behavior) {}
-
-    // Runs before the members are destroyed, so the agent's destructor never joins a stream the printer still holds open.
-    ~StreamFixture() { printer.release(); }
-
-    void start() { agent.start_status_stream("printer", printer.base_url(), ""); }
-
-    // Stops the stream, giving it `limit` to return before the printer hangs up on it.
-    bool stops_within(std::chrono::milliseconds limit)
-    {
-        auto stopped       = std::async(std::launch::async, [this] { agent.stop_status_stream(); });
-        const bool in_time = stopped.wait_for(limit) == std::future_status::ready;
-        printer.release();
-        stopped.wait();
-        return in_time;
-    }
-
-    FakePrinter printer;
-    StreamAgent agent{""};
-};
-
-} // namespace
-
-TEST_CASE("Moonraker discovery waits for a complete device identity", "[MoonrakerPrinterAgent][Discovery]")
-{
-    DiscoveryAgent agent("");
-    unsigned announcements = 0;
-    nlohmann::json announcement;
-    agent.set_on_ssdp_msg_fn([&](std::string payload) {
-        ++announcements;
-        announcement = nlohmann::json::parse(payload);
-    });
-
-    agent.start_discovery(true, false);
-    REQUIRE(announcements == 0);
-    REQUIRE(agent.fetch_count == 0);
-
-    agent.device_info.dev_id = "127.0.0.1:7125";
-    agent.device_info.dev_ip = agent.device_info.dev_id;
-    agent.device_info.base_url = "http://127.0.0.1:7125";
-    agent.start_discovery(true, false);
-    REQUIRE(announcements == 1);
-    REQUIRE(agent.fetch_count == 1);
-    REQUIRE(announcement.at("dev_id") == agent.device_info.dev_id);
-    REQUIRE(announcement.at("dev_ip") == agent.device_info.dev_ip);
-    REQUIRE(announcement.at("dev_name") == "Test printer");
-}
-
-TEST_CASE("Stopping the status stream gives a silent printer no more than its timeouts", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    // An open websocket gets the 200 ms close timeout, and a stalled object list request up to 1 s of curl progress to see the stop.
-    const auto [behavior, limit] = GENERATE(table<Behavior, std::chrono::milliseconds>({
-        {Behavior::SilentBeforeHandshake, 500ms},
-        {Behavior::Silent, 1000ms},
-        {Behavior::StallsObjectList, 2000ms},
-    }));
-    CAPTURE(static_cast<int>(behavior));
-
-    StreamFixture f(behavior);
-    f.agent.ws_timings.close = 200ms;
-    f.start();
-    REQUIRE(f.printer.wait_for_ready_connections(1));
-
-    CHECK(f.stops_within(limit));
-}
-
-TEST_CASE("Stopping the status stream sends the printer a close frame", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    // A stop while the stream reads, and one while it waits on the object list request.
-    const Behavior behavior = GENERATE(Behavior::AnswersPings, Behavior::StallsObjectList);
-    CAPTURE(static_cast<int>(behavior));
-
-    StreamFixture f(behavior);
-    f.start();
-    REQUIRE(f.printer.wait_for_ready_connections(1));
-
-    CHECK(f.stops_within(3s));
-    CHECK(f.printer.wait_for_close_frames(1));
-    CHECK(f.printer.close_frames() == 1);
-}
-
-TEST_CASE("Stopping the status stream does not wait out the reconnect delay", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    StreamFixture f(Behavior::HangsUp);
-    f.agent.ws_timings.reconnect_delay = 10s;
-    f.start();
-    REQUIRE(f.printer.wait_for_ready_connections(1));
-    // Lets the stream reach its reconnect wait.
-    std::this_thread::sleep_for(200ms);
-
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("The status stream reconnects when the printer stops answering", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    // An unanswered close ends at whichever of the handshake and close timeouts is shorter.
-    const auto [behavior, handshake, close] = GENERATE(table<Behavior, std::chrono::milliseconds, std::chrono::milliseconds>({
-        {Behavior::Silent, 300ms, 1000ms},
-        {Behavior::IgnoresClose, 300ms, 1000ms},
-        {Behavior::IgnoresClose, 1000ms, 200ms},
-    }));
-    CAPTURE(static_cast<int>(behavior), handshake.count(), close.count());
-
-    StreamFixture f(behavior);
-    f.agent.ws_timings.handshake       = handshake;
-    f.agent.ws_timings.close           = close;
-    f.agent.ws_timings.idle            = 400ms;
-    f.agent.ws_timings.reconnect_delay = 20ms;
-    f.start();
-
-    CHECK(f.printer.wait_for_ready_connections(2));
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("The status stream reconnects at the shortest delay while the printer answers", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    StreamFixture f(Behavior::HangsUp);
-    f.agent.ws_timings.reconnect_delay = 50ms;
-    f.start();
-
-    // Twelve 50 ms waits; a backoff that kept doubling would need over 10 s.
-    CHECK(f.printer.wait_for_ready_connections(12, 3s));
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("The status stream keeps retrying a printer that never answers", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    StreamFixture f(Behavior::HangsUpWithoutAnswer);
-    f.agent.ws_timings.reconnect_delay = 1ms;
-    f.start();
-
-    // The backoff stops doubling at 32 ms, so 20 attempts take well under the wait.
-    CHECK(f.printer.wait_for_ready_connections(20));
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("A callback on the stream thread can stop the status stream", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    std::promise<void> stopped;
-    std::once_flag stopped_once;
-    StreamFixture f(Behavior::AnswersPings);
-    f.agent.set_on_local_message_fn([&](std::string, std::string) {
-        std::call_once(stopped_once, [&] {
-            f.agent.stop_status_stream();
-            stopped.set_value();
-        });
-    });
-    f.start();
-
-    REQUIRE(stopped.get_future().wait_for(5s) == std::future_status::ready);
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("A quiet printer that is still up keeps reporting its status", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    Reports reports;
-    StreamFixture f(Behavior::AnswersPings);
-    f.agent.ws_timings.idle      = 400ms;
-    f.agent.ws_timings.heartbeat = 300ms;
-    reports.attach(f.agent);
-    f.start();
-
-    // The status the printer sent, then two heartbeats.
-    REQUIRE(reports.wait_for(3));
-    const auto times = reports.times();
-    // The steady clock is compared in whole milliseconds, so allow 1 ms of rounding.
-    CHECK(times[1] - times[0] >= 299ms);
-    CHECK(times[2] - times[1] >= 299ms);
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("The status stream sends no heartbeat while the printer has nothing new to report", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    const Behavior behavior = GENERATE(Behavior::Chatters, Behavior::AnswersPingsWithoutStatus);
-    CAPTURE(static_cast<int>(behavior));
-
-    Reports reports;
-    StreamFixture f(behavior);
-    f.agent.ws_timings.idle      = 400ms;
-    f.agent.ws_timings.heartbeat = 800ms;
-    reports.attach(f.agent);
-    f.start();
-    REQUIRE(f.printer.wait_for_ready_connections(1));
-
-    // The chattering printer's status, and nothing from the one that never sent a status.
-    const std::size_t expected = behavior == Behavior::Chatters ? 1 : 0;
-    std::this_thread::sleep_for(1500ms);
-    CHECK(reports.times().size() == expected);
-    CHECK(f.stops_within(3s));
-}
-
-TEST_CASE("A disconnect during the connection queries keeps the status stream from starting", "[MoonrakerPrinterAgent][StatusStream]")
-{
-    StreamFixture f(Behavior::StallsStatusQuery);
-    PrinterConnectionParams params;
-    params.dev_id = "printer";
-    params.host   = f.printer.host();
-    params.port   = f.printer.port();
-    f.agent.connect_printer(params);
-    REQUIRE(f.printer.wait_for_http_requests(1));
-
-    f.agent.disconnect_printer();
-    f.printer.release();
-    // The query has returned once the printer hangs up on it, and a stream would connect right after.
-    REQUIRE(f.printer.wait_for_http_hang_ups(1));
-    CHECK_FALSE(f.printer.wait_for_ready_connections(1, 500ms));
-}

tests/slic3rutils/test_plugin_install.cpp

@@ -3,7 +3,6 @@
 #include <catch2/catch_all.hpp>
 
 #include <ios>
-#include <libslic3r/Utils.hpp>
 #include <slic3r/plugin/PluginLoader.hpp>
 #include <slic3r/plugin/PluginDescriptor.hpp>
 #include <slic3r/plugin/PluginFsUtils.hpp>
@@ -11,17 +10,13 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_string.hpp>
-#include "catch2/catch_message.hpp"
 #include "plugin_test_utils.hpp"
-#include "test_utils.hpp"
 
 #include <boost/filesystem.hpp>
 
 #include <fstream>
 #include <string>
 
-#include <libslic3r/Zipper.hpp>
-
 using namespace Slic3r;
 namespace fs = boost::filesystem;
 
@@ -36,14 +31,6 @@ fs::path write_py_file(const fs::path& dir, const std::string& filename, const s
     return p;
 }
 
-// The shared production helper: makes the path absolute and lexically normalized and, on
-// Windows, prefixes it with the extended-length "\\?\" form, so the test can create, verify and
-// clean up a tree past MAX_PATH even with LongPathsEnabled off. Identity on other platforms.
-fs::path to_extended_path(const fs::path& p)
-{
-    return Slic3r::extended_path(p);
-}
-
 } // namespace
 
 TEST_CASE("install_plugin rejects a cloud UUID containing path traversal", "[PluginInstall]")
@@ -197,59 +184,3 @@ TEST_CASE("an unsubscribed cloud plugin follows its header version", "[PluginIns
     REQUIRE(read_install_state(plugin_dir, scanned));
     CHECK(scanned.installed_version == "1.0.0");
 }
-
-TEST_CASE("extract_zip_to_directory writes entries under a destination longer than MAX_PATH",
-          "[PluginInstall][PluginFsUtils]")
-{
-    ScopedTemporaryDir dir("deep-extract");
-
-    const fs::path wheel = dir.path() / "deep_pkg-1.0-py3-none-any.whl";
-    const std::string payload = "print('hello from a deep path')\n";
-    {
-        Zipper zipper(wheel.string(), Zipper::NO_COMPRESSION);
-        zipper.add_entry("pkg/", "", 0); // explicit directory entry
-        zipper.add_entry("pkg/module.py", payload.data(), payload.size());
-        zipper.finalize();
-    }
-
-    // A single 240-char component keeps every filename below the NTFS 255 limit while pushing the
-    // full destination (temp dir + component) past the 260-char MAX_PATH the Win32 APIs enforce
-    // when LongPathsEnabled is off.
-    const fs::path destination = dir.path() / std::string(240, 'd');
-    REQUIRE(destination.string().size() > 260);
-
-    std::string error;
-    REQUIRE(extract_zip_to_directory(wheel, destination, error));
-    INFO("extract error: " << error);
-    CHECK(error.empty());
-
-    // Verify through a long-path-capable path, otherwise the check itself is bounded by MAX_PATH.
-    const fs::path module_py = destination / "pkg" / "module.py";
-    REQUIRE(fs::exists(to_extended_path(module_py)));
-    REQUIRE(fs::is_regular_file(to_extended_path(module_py)));
-
-    // Remove the deep subtree here: ScopedTemporaryDir's plain remove_all cannot reach past
-    // MAX_PATH on Windows.
-    boost::system::error_code ec;
-    fs::remove_all(to_extended_path(destination), ec);
-    CHECK_FALSE(ec);
-}
-
-TEST_CASE("extract_zip_to_directory rejects an entry that escapes the destination",
-          "[PluginInstall][PluginFsUtils]")
-{
-    ScopedTemporaryDir dir("escape-extract");
-
-    const fs::path wheel = dir.path() / "evil-1.0-py3-none-any.whl";
-    {
-        Zipper zipper(wheel.string(), Zipper::NO_COMPRESSION);
-        zipper.add_entry("pkg/module.py", "print('ok')\n", 12);
-        zipper.add_entry("../escape.txt", "escaped\n", 8);
-        zipper.finalize();
-    }
-
-    std::string error;
-    CHECK_FALSE(extract_zip_to_directory(wheel, dir.path() / "out", error));
-    CHECK_THAT(error, Catch::Matchers::ContainsSubstring("escapes the plugin package"));
-    CHECK_FALSE(fs::exists(dir.path() / "escape.txt"));
-}

tests/slic3rutils/test_shortcuts.cpp

@@ -126,55 +126,6 @@ TEST_CASE("Only modified or non-printable chords qualify as menu accelerators",
     CHECK(registry.accelerator(Shortcut::KeyboardShortcuts).empty());
 }
 
-TEST_CASE("Typing, caret, deletion and clipboard chords edit text", "[Shortcuts]")
-{
-    CHECK(KeyChord{ 'A' }.edits_text());
-    CHECK(KeyChord{ 'A', wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_SPACE }.edits_text());
-    CHECK(KeyChord{ WXK_BACK }.edits_text());
-    CHECK(KeyChord{ WXK_DELETE }.edits_text());
-    CHECK(KeyChord{ WXK_BACK, wxMOD_CONTROL }.edits_text());
-    CHECK(KeyChord{ WXK_LEFT, wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_RIGHT, wxMOD_CONTROL | wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_HOME }.edits_text());
-    CHECK(KeyChord{ WXK_END, wxMOD_CONTROL }.edits_text());
-    CHECK(KeyChord{ WXK_DELETE, wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_INSERT }.edits_text());
-    CHECK(KeyChord{ WXK_INSERT, wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_INSERT, wxMOD_CONTROL }.edits_text());
-    CHECK(KeyChord{ WXK_PAGEUP, wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_RETURN }.edits_text());
-    CHECK(KeyChord{ WXK_TAB, wxMOD_SHIFT }.edits_text());
-    CHECK(KeyChord{ WXK_ESCAPE }.edits_text());
-    CHECK(KeyChord{ WXK_PAGEDOWN }.edits_text());
-    for (int key : { 'A', 'C', 'V', 'X', 'Y', 'Z' })
-        CHECK(KeyChord{ key, wxMOD_CONTROL }.edits_text());
-    CHECK(KeyChord{ 'Z', wxMOD_CONTROL | wxMOD_SHIFT }.edits_text());
-
-    CHECK_FALSE(KeyChord{ WXK_TAB, wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_RETURN, wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_PAGEDOWN, wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_ESCAPE, wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ 'S', wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ 'S', wxMOD_CONTROL | wxMOD_SHIFT }.edits_text());
-    CHECK_FALSE(KeyChord{ '0', wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_F5 }.edits_text());
-    CHECK_FALSE(KeyChord{}.edits_text());
-#ifdef __APPLE__
-    CHECK(KeyChord{ 'E', wxMOD_ALT }.edits_text());
-    CHECK(KeyChord{ 'K', wxMOD_RAW_CONTROL }.edits_text());
-    CHECK(KeyChord{ WXK_LEFT, wxMOD_ALT }.edits_text());
-    CHECK(KeyChord{ WXK_LEFT, wxMOD_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_LEFT, wxMOD_RAW_CONTROL }.edits_text());
-    CHECK_FALSE(KeyChord{ 'E', wxMOD_CONTROL | wxMOD_ALT }.edits_text());
-#else
-    CHECK(KeyChord{ 'Q', wxMOD_CONTROL | wxMOD_ALT }.edits_text());
-    CHECK_FALSE(KeyChord{ 'E', wxMOD_ALT }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_LEFT, wxMOD_ALT }.edits_text());
-    CHECK_FALSE(KeyChord{ WXK_LEFT, wxMOD_CONTROL | wxMOD_ALT }.edits_text());
-#endif
-}
-
 TEST_CASE("Chords the desktop keeps for itself are recognized", "[Shortcuts]")
 {
 #ifdef _WIN32
@@ -235,21 +186,6 @@ TEST_CASE("Default bindings never collide inside a context", "[Shortcuts]")
     }
 }
 
-TEST_CASE("No default Global binding except the Speed Dial's Space edits text", "[Shortcuts]")
-{
-    ShortcutRegistry registry;
-    size_t           checked = 0;
-    for (size_t i = 0; i < size_t(Shortcut::Count); ++i) {
-        const ShortcutInfo& info = shortcut_info(Shortcut(i));
-        if ((info.contexts & context_bit(ShortcutContext::Global)) == 0 || info.id == Shortcut::SpeedDial)
-            continue;
-        CAPTURE(info.key);
-        CHECK_FALSE(registry.binding(info.id).edits_text());
-        ++checked;
-    }
-    CHECK(checked > 0);
-}
-
 TEST_CASE("Shift and Ctrl variants of stepping shortcuts are left unbound", "[Shortcuts]")
 {
     ShortcutRegistry registry;