Move the Cube with the Wipe Tower in the Profile Validator

The slice check centres its cube on the bed, puts the prime tower beside it, then pulls the tower alone inside the printable outline. On a bed too narrow for the estimated footprint that pull drags the tower back over the cube: Volumic EXO42 IDRE MIRROR MODE (189 mm wide, 87.6 mm estimate) logged "gcode path conflicts found between WipeTower and cube" in every run, and three ~105 mm beds were left with 0.15 to 3.3 mm of clearance. The cube and the tower's footprint are now pulled inside as one rigid pair, so the clearance between them is fixed by construction. A bed too small for the pair keeps the old placement, and presets that were never clamped keep their exact layout.
fix: update OrcaArena product URL (#15796 )
2026-09-21 16:02:37 +00:00 · 2026-09-21 18:45:16 +08:00 · 2026-09-21 09:53:13 +00:00 · 2026-09-21 17:13:44 +08:00 · 2026-09-21 17:09:05 +08:00 · 2026-09-21 16:53:16 +08:00
143 changed files with 1710 additions and 10894 deletions
@@ -529,7 +529,7 @@ jobs:
      && github.event_name == 'pull_request_target'
    permissions:
      contents: read
-      pull-requests: read
+      pull-requests: write
      issues: write
    runs-on: ubuntu-latest
    timeout-minutes: 5
@@ -636,7 +636,7 @@ jobs:
      && github.event_name == 'pull_request_target'
    permissions:
      contents: read        # delegatable subtree, for file modes
-      pull-requests: read
+      pull-requests: write
      issues: write         # label + comment
    runs-on: ubuntu-latest
    timeout-minutes: 10
@@ -826,37 +826,6 @@ find_package(OpenSSL REQUIRED)
 find_package(CURL REQUIRED)
 find_package(Freetype REQUIRED)

-if (SLIC3R_GUI)
-    # LibDataChannel's installed export references its bundled dependencies,
-    # but does not install their CMake targets. Recreate those targets from
-    # the same dependency prefix before loading the LibDataChannel config.
-    if (NOT TARGET Usrsctp::usrsctp)
-        find_library(_ORCA_USRSCTP_LIBRARY NAMES usrsctp
-            PATHS "${CMAKE_PREFIX_PATH}/lib" NO_DEFAULT_PATH)
-        if (_ORCA_USRSCTP_LIBRARY)
-            add_library(Usrsctp::usrsctp UNKNOWN IMPORTED GLOBAL)
-            set_target_properties(Usrsctp::usrsctp PROPERTIES
-                IMPORTED_LOCATION "${_ORCA_USRSCTP_LIBRARY}"
-                IMPORTED_LINK_INTERFACE_LANGUAGES C
-                INTERFACE_LINK_LIBRARIES "Threads::Threads")
-        endif()
-    endif()
-
-    if (NOT TARGET LibJuice::LibJuice)
-        find_library(_ORCA_LIBJUICE_LIBRARY NAMES juice
-            PATHS "${CMAKE_PREFIX_PATH}/lib" NO_DEFAULT_PATH)
-        if (_ORCA_LIBJUICE_LIBRARY)
-            add_library(LibJuice::LibJuice UNKNOWN IMPORTED GLOBAL)
-            set_target_properties(LibJuice::LibJuice PROPERTIES
-                IMPORTED_LOCATION "${_ORCA_LIBJUICE_LIBRARY}"
-                IMPORTED_LINK_INTERFACE_LANGUAGES C
-                INTERFACE_LINK_LIBRARIES "Threads::Threads")
-        endif()
-    endif()
-
-    find_package(LibDataChannel CONFIG REQUIRED)
-endif()
-

 add_library(libcurl INTERFACE)
 target_link_libraries(libcurl INTERFACE CURL::libcurl)
@@ -1137,7 +1106,6 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
    endif ()
    file(COPY ${_occt_dlls}
            ${CMAKE_PREFIX_PATH}/bin/freetype.dll
-            ${CMAKE_PREFIX_PATH}/bin/avformat-61.dll
            ${CMAKE_PREFIX_PATH}/bin/avcodec-61.dll
            ${CMAKE_PREFIX_PATH}/bin/swresample-5.dll
            ${CMAKE_PREFIX_PATH}/bin/swscale-8.dll
@@ -1150,7 +1118,6 @@ function(orcaslicer_copy_dlls target config postfix output_dlls)
        ${_out_dir}/WebView2Loader.dll

        ${_out_dir}/freetype.dll
-        ${_out_dir}/avformat-61.dll
        ${_out_dir}/avcodec-61.dll
        ${_out_dir}/swresample-5.dll
        ${_out_dir}/swscale-8.dll
@@ -1175,10 +1142,7 @@ function(orcaslicer_copy_sos target config postfix output_sos)
        set(_out_dir "${CMAKE_CURRENT_BINARY_DIR}")
    endif ()

-    file(COPY ${CMAKE_PREFIX_PATH}/lib/libavformat.so
-            ${CMAKE_PREFIX_PATH}/lib/libavformat.so.61
-            ${CMAKE_PREFIX_PATH}/lib/libavformat.so.61.1.100
-            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so
+    file(COPY ${CMAKE_PREFIX_PATH}/lib/libavcodec.so
            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61
            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61.3.100
            ${CMAKE_PREFIX_PATH}/lib/libavutil.so
@@ -1193,9 +1157,6 @@ function(orcaslicer_copy_sos target config postfix output_sos)
         DESTINATION ${_out_dir})

    set(${output_sos}
-        ${_out_dir}/libavformat.so
-        ${_out_dir}/libavformat.so.61
-        ${_out_dir}/libavformat.so.61.1.100
        ${_out_dir}/libavcodec.so
        ${_out_dir}/libavcodec.so.61
        ${_out_dir}/libavcodec.so.61.3.100
@@ -1325,8 +1286,6 @@ endif ()

 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
    set(LIBRARY_FILES
-    ${LIBDIR_BIN}/libavformat.so.61
-    ${LIBDIR_BIN}/libavformat.so.61.1.100
    ${LIBDIR_BIN}/libavcodec.so.61
    ${LIBDIR_BIN}/libavcodec.so.61.3.100
    ${LIBDIR_BIN}/libavutil.so.59
@@ -156,7 +156,7 @@ if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE)
 endif ()

 function(orcaslicer_add_cmake_project projectname)
-    cmake_parse_arguments(P_ARGS "FORWARD_CONFIG" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND;SOURCE_DIR" "CMAKE_ARGS" ${ARGN})
+    cmake_parse_arguments(P_ARGS "FORWARD_CONFIG" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})

    # MSVC is true for clang-cl as well, so the sub-build toolchain has to key on the
    # generator. A non-Visual-Studio superbuild passes its own generator down, and with
@@ -202,18 +202,12 @@ function(orcaslicer_add_cmake_project projectname)
      set(_build_j "-j${NPROC}")
    endif ()

-    set(_source_dir_arg "")
-    if (P_ARGS_SOURCE_DIR)
-        set(_source_dir_arg SOURCE_DIR ${P_ARGS_SOURCE_DIR})
-    endif ()
-
 if (NOT IS_CROSS_COMPILE OR NOT APPLE)
    ExternalProject_Add(
        dep_${projectname}
        EXCLUDE_FROM_ALL    ON
        INSTALL_DIR         ${DESTDIR}
        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
-        ${_source_dir_arg}
        ${_gen}
        CMAKE_ARGS
            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
@@ -246,14 +240,12 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE)
        # note for future devs: shared libs may actually create a size reduction
        # but orcaslicer_deps tends to get really funny regarding linking after that (notably boost)
        # so, as much as I would like to use that, it's not happening
-        if (NOT P_ARGS_SOURCE_DIR)
-            ExternalProject_Add_Step(dep_${projectname} free_download_space
-                    DEPENDEES download # do after download
-                    COMMENT "Freeing Space: Removing source archive"
-                    WORKING_DIRECTORY ${DEP_DOWNLOAD_DIR}
-                    COMMAND ${CMAKE_COMMAND} -E rm -rf ${projectname}
-            )
-        endif ()
+        ExternalProject_Add_Step(dep_${projectname} free_download_space
+                DEPENDEES download # do after download
+                COMMENT "Freeing Space: Removing source archive"
+                WORKING_DIRECTORY ${DEP_DOWNLOAD_DIR}
+                COMMAND ${CMAKE_COMMAND} -E rm -r ${projectname}
+        )
        ExternalProject_Add_Step(dep_${projectname} free_build_space
                DEPENDEES install # do after install
                COMMENT "Freeing Space: Removing source and build files"
@@ -267,7 +259,6 @@ else()
        EXCLUDE_FROM_ALL    ON
        INSTALL_DIR         ${DESTDIR}
        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
-        ${_source_dir_arg}
        ${_gen}
        CMAKE_ARGS
            -DCMAKE_POLICY_VERSION_MINIMUM=3.5
@@ -395,6 +386,10 @@ include(libnoise/libnoise.cmake)

 include(Draco/Draco.cmake)

+include(FFMPEG/FFMPEG.cmake)
+include(Assimp/Assimp.cmake)
+
+
 # I *think* 1.1 is used for *just* md5 hashing?
 # 3.1 has everything in the right place, but the md5 funcs used are deprecated
 # a grep across the repo shows it is used for other things
@@ -405,12 +400,6 @@ if(NOT OPENSSL_FOUND)
    set(OPENSSL_PKG dep_OpenSSL)
 endif()

-include(FFMPEG/FFMPEG.cmake)
-include(Assimp/Assimp.cmake)
-
-include(DataChannel/DataChannel.cmake)
-set(DATACHANNEL_PKG dep_DataChannel)
-
 # we don't want to load a "wrong" openssl when loading curl
 # so, just don't even bother
 # ...i think this is how it works? change if wrong
@@ -484,7 +473,6 @@ set(_dep_list
    dep_wxInspector
    dep_FFMPEG
    dep_Assimp
-    ${DATACHANNEL_PKG}
    )

 if (MSVC)
@@ -1,37 +0,0 @@
-# libdatachannel is the native ICE/DTLS/SCTP implementation used by the
-# GUI WebRTC camera controller. Keep the source revision fixed: the signaling
-# protocol is evolving independently of this transport dependency.
-#
-# It vendors plog, usrsctp and libjuice as git submodules, which a plain
-# GitHub tag tarball does not include. The flatpak sandbox has no network
-# access during the build, so there the manifest itself clones the repo
-# (submodules and all) into the dependency download directory before the
-# sandbox closes. ExternalProject_Add is pointed at that existing checkout
-# instead of being given its own network-dependent download method.
-if (FLATPAK)
-    set(_datachannel_source
-        SOURCE_DIR ${DEP_DOWNLOAD_DIR}/DataChannel
-    )
-else()
-    set(_datachannel_source
-        GIT_REPOSITORY https://github.com/paullouisageneau/libdatachannel.git
-        GIT_TAG v0.24.5
-        GIT_SHALLOW ON
-        GIT_SUBMODULES_RECURSE ON
-    )
-endif()
-
-orcaslicer_add_cmake_project(DataChannel
-    DEPENDS ${OPENSSL_PKG}
-    CMAKE_ARGS
-        -DNO_EXAMPLES=ON
-        -DNO_TESTS=ON
-        -DNO_WEBSOCKET=ON
-        -DNO_MEDIA=ON
-        -DUSE_NICE=OFF
-        -DUSE_SYSTEM_JUICE=OFF
-        -DUSE_SYSTEM_USRSCTP=OFF
-        -DOPENSSL_ROOT_DIR:PATH=${DESTDIR}
-        -DOPENSSL_USE_STATIC_LIBS=ON
-    ${_datachannel_source}
-)
@@ -1,26 +1,14 @@
 set(_conf_cmd ./configure)

-set(_ffmpeg_depends)
-set(_ffmpeg_configure_command ${_conf_cmd})
-if (TARGET dep_OpenSSL)
-    set(_ffmpeg_depends DEPENDS dep_OpenSSL)
-    set(_ffmpeg_configure_command
-        ${CMAKE_COMMAND} -E env
-        "PKG_CONFIG_PATH=${DESTDIR}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}"
-        ${_conf_cmd}
-    )
-endif()
-
 if (MSVC)
    set(_source_dir "${CMAKE_BINARY_DIR}/dep_FFMPEG-prefix/src/dep_FFMPEG")

-    set(PREBUILD_URL_arm64 "https://github.com/Noisyfox/FFmpeg-Builds-Orca/releases/download/autobuild-2026-09-18-16-50/ffmpeg-n7.0.3-33-g887d4b4919-winarm64-orca-shared-7.0.zip")
-    set(PREBUILD_HASH_arm64 "da480cbb39680056de824c57ec4dc3bd577b479ebbc310ff1f9dc55cf014b4c1")
-    set(PREBUILD_URL_x64 "https://github.com/Noisyfox/FFmpeg-Builds-Orca/releases/download/autobuild-2026-09-18-16-50/ffmpeg-n7.0.3-33-g887d4b4919-win64-orca-shared-7.0.zip")
-    set(PREBUILD_HASH_x64 "85da19daf198f5548259d8aabb349db84997a3f6e6886d8d7764114add9c6dae")
+    set(PREBUILD_URL_arm64 "https://github.com/Noisyfox/FFmpeg-Builds-Orca/releases/download/autobuild-2026-07-17-14-28/ffmpeg-n7.0.3-31-g9b6ffd74b5-winarm64-orca-shared-7.0.zip")
+    set(PREBUILD_HASH_arm64 "12f4140279f2f8469885e1b5b2e8be9d788882914c21523cacd56989f3548054")
+    set(PREBUILD_URL_x64 "https://github.com/Noisyfox/FFmpeg-Builds-Orca/releases/download/autobuild-2026-07-17-14-28/ffmpeg-n7.0.3-31-g9b6ffd74b5-win64-orca-shared-7.0.zip")
+    set(PREBUILD_HASH_x64 "e65916020ddb9ef84b2666dfbcbfc9b1d67f69d15b4a66db53754637bf2d498c")

    ExternalProject_Add(dep_FFMPEG
-        ${_ffmpeg_depends}
        URL ${PREBUILD_URL_${DEPS_ARCH}}
        URL_HASH SHA256=${PREBUILD_HASH_${DEPS_ARCH}}
        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFMPEG
@@ -33,8 +21,6 @@ if (MSVC)
    )

 else ()
-    set(_openssl_cmd --enable-openssl)
-
    if (APPLE)
        set(_minos_cmd
            "--extra-cflags=-mmacosx-version-min=${DEP_OSX_TARGET}"
@@ -66,11 +52,10 @@ else ()
    endif()

    ExternalProject_Add(dep_FFMPEG
-        ${_ffmpeg_depends}
        URL https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.0.3.tar.gz
        URL_HASH SHA256=DEEDCABE339165214A3637DF4C86A507AEF0D793CF8774FF68735F4737E8DDBC
        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFMPEG
-        CONFIGURE_COMMAND ${_ffmpeg_configure_command}
+        CONFIGURE_COMMAND ${_conf_cmd}
            ${_cross_cmd}
            ${_pic_cmd}
            ${_arch_cmd}
@@ -78,21 +63,20 @@ else ()
            "--prefix=${DESTDIR}"
            ${_link_cmd}
            ${_minos_cmd}
-            ${_openssl_cmd}
            --disable-doc
            --enable-small
            --disable-outdevs
            --disable-filters
            --enable-filter=*null*,afade,*fifo,*format,*resample,aeval,allrgb,allyuv,atempo,pan,*bars,color,*key,crop,draw*,eq*,framerate,*_qsv,*_vaapi,*v4l2*,hw*,scale,volume,test*
            --disable-protocols
-            --enable-protocol=file,fd,pipe,http,https,rtp,tcp,udp
+            --enable-protocol=file,fd,pipe,rtp,udp
            --disable-muxers
            --enable-muxer=rtp
            --disable-encoders
            --disable-decoders
            --enable-decoder=*aac*,h264*,mp3*,mjpeg,rv*
            --disable-demuxers
-            --enable-demuxer=h264,mp3,mov,mpjpeg,rtsp,sdp
+            --enable-demuxer=h264,mp3,mov
            --disable-zlib
            --disable-avdevice
        BUILD_IN_SOURCE ON
@@ -1,6 +1,6 @@
 {
 	"name": "Creality",
-	"version": "02.03.02.82",
+	"version": "02.03.02.84",
 	"force_update": "0",
 	"description": "Creality configurations",
 	"machine_model_list": [
@@ -55,7 +55,7 @@
 		"0"
 	],
 	"filament_max_volumetric_speed": [
-		"12"
+		"8"
 	],
 	"filament_retract_before_wipe": [
 		"100"
@@ -43,19 +43,19 @@
 		"1.75"
 	],
 	"filament_flow_ratio": [
-		"0.98"
+		"0.95"
 	],
 	"filament_is_support": [
 		"0"
 	],
 	"filament_max_volumetric_speed": [
-		"16"
+		"14"
 	],
 	"filament_minimal_purge_on_wipe_tower": [
 		"15"
 	],
 	"filament_retract_before_wipe": [
-		"nil"
+		"100%"
 	],
 	"filament_retract_restart_extra": [
 		"nil"
@@ -67,7 +67,7 @@
 		"nil"
 	],
 	"filament_retraction_minimum_travel": [
-		"nil"
+		"2"
 	],
 	"filament_retraction_speed": [
 		"nil"
@@ -106,7 +106,10 @@
 		"0"
 	],
 	"slow_down_layer_time": [
-		"8"
+		"14"
+	],
+	"slow_down_min_speed": [
+		"20"
 	],
 	"temperature_vitrification": [
 		"110"
@@ -118,7 +121,7 @@
 		"55"
 	],
 	"filament_start_gcode": [
-		"; Filament gcode\n"
+		";filament start gcode\n"
 	],
 	"filament_end_gcode": [
 		"; filament end gcode \n"
@@ -153,7 +156,7 @@
 	"filament_unloading_speed_start": "100",
 	"material_flow_dependent_temperature": "0",
 	"material_flow_temp_graph": "[[0.2,210],[0.6,220]]",
-	"pressure_advance": "0.12",
+	"pressure_advance": "0.032",
 	"support_material_interface_fan_speed": "-1",
 	"compatible_printers": [
 		"Creality SPARKX i7 0.2 nozzle",
@@ -54,7 +54,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 X20 Y-1 F30000\nG1 Z0.3 F1200\nG1 X100 E10  F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X120 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X125 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X1 Z-0.300\nG1 X4\nG92 E0\nG1 Z1 F1200",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 X20 Y-1 F30000\nG1 Z0.3 F1200\nG1 X100 E10  F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X120 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X125 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X1 Z-0.300\nG1 X4\nG92 E0\nG1 Z1 F1200",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA HF @Creality"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -56,7 +56,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
 	"machine_ptc_exist": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -123,7 +123,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails_format": "PNG",
@@ -57,7 +57,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -57,7 +57,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -55,7 +55,7 @@
 	"machine_min_travel_rate": "0,0",
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -124,7 +124,7 @@
 	"default_filament_profile": [
 		"Generic PLA @Creality K1-all"
 	],
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_end_gcode": "END_PRINT",
 	"scan_first_layer": "0",
 	"thumbnails": [
@@ -56,7 +56,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
 	"machine_ptc_exist": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -57,7 +57,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "1",
 	"machine_ptc_exist": "1",
-	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
+	"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
 	"machine_unload_filament_time": "0",
 	"manual_filament_change": "0",
 	"nozzle_hrc": "0",
@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",
@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",
@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",
@@ -59,7 +59,7 @@
 	"machine_pause_gcode": "PAUSE",
 	"machine_platform_motion_enable": "0",
 	"machine_ptc_exist": "0",
-	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
+	"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742  F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
 	"machine_tool_change_time": "0",
 	"machine_unload_filament_time": "30",
 	"manual_filament_change": "0",
@@ -1,7 +1,7 @@
 {
 	"name": "Orca Arena Printer",
 	"url": "",
-	"version": "02.04.00.05",
+	"version": "02.04.00.06",
 	"force_update": "0",
 	"description": "Orca Arena configuration files",
 	"machine_model_list": [
@@ -2,7 +2,7 @@
 	"type": "machine_model",
 	"name": "Orca Arena X1 Carbon",
 	"model_id": "orca_arena_x1c",
-	"url": "",
+	"url": "https://www.orcaslicer.com",
 	"nozzle_diameter": "0.4;0.2;0.6;0.8",
 	"machine_tech": "FFF",
 	"family": "ARENA-3DP",
@@ -1,6 +1,6 @@
 {
 	"name": "OrcaFilamentLibrary",
-	"version": "02.04.00.08",
+	"version": "02.04.00.09",
 	"force_update": "0",
 	"description": "Orca Filament Library",
 	"filament_list": [
@@ -3,6 +3,7 @@
 	"name": "DREMC ABS @System",
 	"inherits": "DREMC ABS @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "gNjISMxTLwQzDrV9",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,6 +3,7 @@
 	"name": "DREMC ABS+ @System",
 	"inherits": "DREMC ABS+ @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "M73sIwcpWv6zpFrb",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,6 +3,7 @@
 	"name": "DREMC ASA @System",
 	"inherits": "DREMC ASA @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "PMulSQ0tYbNyvOYw",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,6 +3,7 @@
 	"name": "DREMC ASA CF @System",
 	"inherits": "DREMC ASA CF @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "ZcipEKAqtBcAm6vR",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,6 +3,7 @@
 	"name": "DREMC ASA GF @System",
 	"inherits": "DREMC ASA GF @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "8J3lt7KlQWcx0VUS",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,6 +3,7 @@
 	"name": "DREMC PA12-CF @System",
 	"inherits": "DREMC PA12-CF @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "jVlZ1KPsA5i8RIED",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,6 +3,7 @@
 	"name": "DREMC PET-CF @System",
 	"inherits": "DREMC PET-CF @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "hal1nPyBF13UL9qB",
+	"instantiation": "true",
 	"compatible_printers": []
 }
@@ -3,7 +3,8 @@
 	"name": "DREMC PETG @System",
 	"inherits": "DREMC PETG @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "gTGiaBYfymmtlyfG",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"20"
 	],
@@ -1,9 +1,10 @@
 {
 	"type": "filament",
 	"name": "DREMC PLA+ HS @System",
-	"inherits": "DREMC PLA+ @base",
+	"inherits": "DREMC PLA+ HS @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "I0HWhYAZ3ppq91Gx",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"22"
 	],
@@ -3,7 +3,8 @@
 	"name": "DREMC PLA+ @System",
 	"inherits": "DREMC PLA+ @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "fIjHIsFmdDWIM1bf",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"18"
 	],
@@ -3,7 +3,8 @@
 	"name": "DREMC TPU 95A @System",
 	"inherits": "DREMC TPU 95A @base",
 	"from": "system",
-	"instantiation": "false",
+	"setting_id": "AfnFh14wKZsNEaZ1",
+	"instantiation": "true",
 	"filament_max_volumetric_speed": [
 		"6"
 	],
@@ -33,15 +33,15 @@
        "210"
    ],
    "hot_plate_temp": [
-        "60"
+        "50"
    ],
    "hot_plate_temp_initial_layer": [
-        "60"
+        "50"
    ],
    "textured_plate_temp": [
-        "60"
+        "50"
    ],
    "textured_plate_temp_initial_layer": [
-        "60"
+        "50"
    ]
 }
@@ -575,7 +575,7 @@ function CapabilityCanRun(plugin, capability) {
 }

 function IsPluginChecked(plugin) {
-  return plugin.is_loaded;
+  return GetStatus(plugin) === "Activated";
 }

 function HasMixedCapabilityState(plugin) {
@@ -1347,8 +1347,6 @@ function StatusDescription(plugin) {
      return "This plugin is still loading.";
    case "Error":
      return "This plugin is blocked until its error is fixed.";
-    case "RuntimeError":
-      return "This plugin is loaded but a capability reported an error.";
    case "Inactive":
    default:
      return "This plugin is inactive. Activate it to install or load it.";
@@ -424,11 +424,6 @@ body.pane-resizing {
  font-weight: 600;
 }

-.status-cell.status-runtimeerror {
-  color: var(--plugin-status-warn);
-  font-weight: 600;
-}
-
 .status-cell.status-loading {
  color: var(--plugin-status-warn);
  font-weight: 600;
@@ -685,11 +680,6 @@ body.pane-resizing {
  color: var(--plugin-status-danger);
 }

-.detail-status-chip.status-runtimeerror {
-  background: var(--plugin-status-warn-bg);
-  color: var(--plugin-status-warn);
-}
-
 .detail-status-chip.status-loading {
  background: var(--plugin-status-warn-bg);
  color: var(--plugin-status-warn);
@@ -331,15 +331,6 @@ modules:
        sha256: deedcabe339165214a3637df4c86a507aef0d793cf8774ff68735f4737e8ddbc
        dest: external-packages/FFMPEG

-      # libdatachannel v0.24.5
-      # The Git checkout includes the submodules that are missing from the
-      # GitHub source archive. DataChannel.cmake consumes it as SOURCE_DIR.
-      - type: git
-        url: https://github.com/paullouisageneau/libdatachannel.git
-        tag: v0.24.5
-        commit: 443f6934d9007eb7076ab7825ba330f355fcbead
-        dest: external-packages/DataChannel
-
      # ---------------------------------------------------------------
      # Fallback archives for deps normally provided by the GNOME SDK.
      # These are only used if find_package() fails to locate them.
@@ -24,7 +24,7 @@ NAMESPACE = "lane_data"

 # Repo-relative paths for the offline generic-map check
 REPO_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-AMS_PAYLOAD_CPP = os.path.join(REPO_ROOT, "src", "slic3r", "Utils", "AmsPayload.cpp")
+MOONRAKER_AGENT_CPP = os.path.join(REPO_ROOT, "src", "slic3r", "Utils", "MoonrakerPrinterAgent.cpp")
 OFL_FILAMENT_DIR = os.path.join(REPO_ROOT, "resources", "profiles", "OrcaFilamentLibrary", "filament")
 LANE_KEYS = [f"lane{i}" for i in range(1, 9)]  # lane1-lane8
 MATERIALS = ["PLA", "ABS", "PETG", "ASA", "ASA Sparkle", "TPU", ""]
@@ -41,16 +41,16 @@ MATERIAL_TEMPS = {
 }

 def parse_cpp_type_map():
-    """Extract the normalized-type -> OFL generic family table from AmsPayload.cpp.
+    """Extract the normalized-type -> OFL generic family table from MoonrakerPrinterAgent.cpp.

-    Reads map_filament_type_to_generic_id's type_to_ofl_family initializer so the
-    check tracks the C++ normalization without a duplicated list.
+    Reads MoonrakerPrinterAgent::map_filament_type_to_generic_id's type_to_ofl_family
+    initializer so the check tracks the C++ normalization without a duplicated list.
    """
-    with open(AMS_PAYLOAD_CPP, encoding="utf-8") as f:
+    with open(MOONRAKER_AGENT_CPP, encoding="utf-8") as f:
        src = f.read()
    m = re.search(r"type_to_ofl_family\s*=\s*\{(.*?)\n\s*\};", src, re.DOTALL)
    if not m:
-        raise RuntimeError(f"type_to_ofl_family table not found in {AMS_PAYLOAD_CPP}")
+        raise RuntimeError(f"type_to_ofl_family table not found in {MOONRAKER_AGENT_CPP}")
    pairs = re.findall(r'\{\s*"([^"]+)"\s*,\s*"([^"]+)"\s*\}', m.group(1))
    if not pairs:
        raise RuntimeError("type_to_ofl_family table parsed empty")
@@ -122,17 +122,19 @@ Vec2d printable_area_center(const DynamicPrintConfig &cfg)

 // Put the prime tower where the GUI and CLI would before slicing. The config default (x 15, y 220)
 // lies off any bed shallower than the tower, and generation rejects an off-plate tower instead of
-// exporting it. Beside the centred cube, clear of the edge exclusion strips some beds carry, then
-// pulled inside the printable outline by the tower's own estimated footprint, with a few mm of
-// clearance so the conflict checker never sees the two touch.
-void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
+// exporting it. Beside the cube at the bed centre, clear of the edge exclusion strips some beds
+// carry, with a few mm of clearance so the conflict checker never sees the two touch. The cube and
+// the tower's estimated footprint are then pulled inside the printable outline as one rigid pair:
+// moving the tower alone would push it back onto the cube on a narrow bed. Returns that move for
+// the cube.
+Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
 {
    const auto *area = cfg.option<ConfigOptionPoints>("printable_area");
    if (area == nullptr || area->values.size() < 3)
-        return;
+        return Vec2d::Zero();
    const WipeTowerFootprint footprint = estimate_wipe_tower_footprint(cfg, resolve_wipe_tower_type(cfg), {0, 1}, cfg.opt_float("layer_height"), 10.);
    if (footprint.depth < EPSILON)
-        return;
+        return Vec2d::Zero();
    const double margin = WIPE_TOWER_MARGIN + footprint.brim_width;
    // The position is the tower's own origin; a rotated tower extends from it in another
    // direction, so place the rotated box's extents rather than the origin.
@@ -143,13 +145,22 @@ void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
    const Vec2d       size  = unscale(local.max) - lo;
    Vec2d             pos(center.x() + 5. + margin + 5. - lo.x(), center.y() - size.y() / 2. - lo.y());
    box.translate(Point::new_scale(pos.x(), pos.y()));
-    const Vec2f move = WipeTower::move_box_inside_polygon(get_extents(box), Polygons{Polygon::new_scale(area->values)}, scaled<coord_t>(margin));
-    pos += move.cast<double>();
+    // A bed too small for the pair keeps the cube at its centre and places the tower alone.
+    const Polygons    bed{Polygon::new_scale(area->values)};
+    const BoundingBox tower = get_extents(box);
+    BoundingBox       pair  = tower;
+    pair.merge(Point::new_scale(center.x() - 5., center.y() - 5.));
+    pair.merge(Point::new_scale(center.x() + 5., center.y() + 5.));
+    const Point       room  = get_extents(bed).size() - Point::new_scale(2. * margin, 2. * margin);
+    const bool        rigid = pair.size().x() < room.x() && pair.size().y() < room.y();
+    const Vec2d       move  = WipeTower::move_box_inside_polygon(rigid ? pair : tower, bed, scaled<coord_t>(margin)).cast<double>();
+    pos += move;
    cfg.option<ConfigOptionFloats>("wipe_tower_x", true)->values = {pos.x()};
    cfg.option<ConfigOptionFloats>("wipe_tower_y", true)->values = {pos.y()};
+    return rigid ? move : Vec2d::Zero();
 }

-// Slice one centered cube that switches from filament 1 to filament 2 partway up, so exactly one
+// Slice one cube that switches from filament 1 to filament 2 partway up, so exactly one
 // filament change fires, then export. The change drives the printer's own change_filament_gcode: on a
 // single-nozzle machine it rides the AMS prime tower (append_tcr), on a multi-nozzle machine it routes
 // through the nozzle swap (set_extruder / append_tcr2) - the engine picks the path from the printer's
@@ -157,10 +168,10 @@ void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d &center)
 // Slic3r::PlaceholderParserError from export.
 std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl)
 {
-    const Vec2d center = printable_area_center(cfg);
-    place_wipe_tower(cfg, center);
+    const Vec2d center   = printable_area_center(cfg);
+    const Vec2d cube_min = center - Vec2d(5., 5.) + place_wipe_tower(cfg, center);
    TriangleMesh m = make_cube(10, 10, 10);
-    m.translate(float(center.x() - 5.), float(center.y() - 5.), 0.f);
+    m.translate(static_cast<float>(cube_min.x()), static_cast<float>(cube_min.y()), 0.f);

    Model  model;
    Print  print;
@@ -3824,6 +3824,7 @@ unsigned int PresetBundle::sync_ams_list(std::vector<std::pair<DynamicPrintConfi
    ConfigOptionStrings *filament_color_type = project_config.option<ConfigOptionStrings>("filament_colour_type");
    ConfigOptionInts *   filament_map = project_config.option<ConfigOptionInts>("filament_map");
    ConfigOptionInts *   filament_volume_map = project_config.option<ConfigOptionInts>("filament_volume_map");
+
    // Snapshot and temporarily strip mixed filament slots so AMS sync operates on physical
    // filaments only. A mixed slot is virtual and has no tray to sync against; leaving it in
    // would let AMS mapping overwrite it and would break the physical-first slot ordering the
@@ -226,7 +226,6 @@ set(SLIC3R_GUI_SOURCES
    GUI/GLToolbar.hpp
    GUI/ImageDPIFrame.cpp
    GUI/ImageDPIFrame.hpp
-    GUI/IMediaController.hpp
    GUI/GUI_App.cpp
    GUI/GUI_App.hpp
    GUI/GUI_AuxiliaryList.cpp
@@ -348,8 +347,6 @@ set(SLIC3R_GUI_SOURCES
    GUI/MediaFilePanel.h
    GUI/MediaPlayCtrl.cpp
    GUI/MediaPlayCtrl.h
-    GUI/WebRtcMediaController.cpp
-    GUI/WebRtcMediaController.hpp
    GUI/MeshUtils.cpp
    GUI/MeshUtils.hpp
    GUI/ModelMall.cpp
@@ -543,8 +540,6 @@ set(SLIC3R_GUI_SOURCES
    GUI/WebUserLoginDialog.hpp
    GUI/WebViewDialog.cpp
    GUI/WebViewDialog.hpp
-    GUI/WebMediaController.hpp
-    GUI/WebMediaController.cpp
    GUI/Widgets/AMSControl.cpp
    GUI/Widgets/AMSControl.hpp
    GUI/Widgets/AMSItem.cpp
@@ -739,17 +734,10 @@ set(SLIC3R_GUI_SOURCES
    Utils/NetworkAgentFactory.cpp
    Utils/ICloudServiceAgent.hpp
    Utils/IPrinterAgent.hpp
-    Utils/ICameraSignalingChannel.hpp
    Utils/OrcaCloudServiceAgent.cpp
    Utils/OrcaCloudServiceAgent.hpp
-    Utils/OrcaMqttConnection.cpp
-    Utils/OrcaMqttConnection.hpp
    Utils/OrcaPrinterAgent.cpp
    Utils/OrcaPrinterAgent.hpp
-    Utils/AmsPayload.cpp
-    Utils/AmsPayload.hpp
-    Utils/OrcaCloudSignalingChannel.cpp
-    Utils/OrcaCloudSignalingChannel.hpp
    Utils/QidiPrinterAgent.cpp
    Utils/QidiPrinterAgent.hpp
    Utils/SnapmakerPrinterAgent.cpp
@@ -890,7 +878,7 @@ target_include_directories(libslic3r_gui PRIVATE Utils ${CMAKE_CURRENT_BINARY_DI

 if (WIN32)
    target_include_directories(libslic3r_gui SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../deps/WebView2/include)
-    target_link_libraries(libslic3r_gui Advapi32 Crypt32)
+    target_link_libraries(libslic3r_gui Advapi32)
 endif()

 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES})
@@ -916,7 +904,7 @@ else()
    set(_opengl_link_lib OpenGL::GL)
 endif()

-target_link_libraries(libslic3r_gui libslic3r cereal::cereal imgui imguizmo minilzo libvgcode md4c-html glad ${_opengl_link_lib} hidapi mdns ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto LibDataChannel::LibDataChannel noise::noise pybind11::embed)
+target_link_libraries(libslic3r_gui libslic3r cereal::cereal imgui imguizmo minilzo libvgcode md4c-html glad ${_opengl_link_lib} hidapi mdns ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto noise::noise pybind11::embed)

 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
    # Linux finds wxWidgets in module mode, whose include dirs and definitions
@@ -973,32 +961,29 @@ endif ()

 if (APPLE)
    # Static FFmpeg from the deps install: nothing to bundle into the .app,
-    # no rpath/install_name handling. Order matters: avformat -> avcodec -> swscale -> avutil.
-    find_library(LIBAVFORMAT_LIBRARY NAMES libavformat.a PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
+    # no rpath/install_name handling. Order matters: avcodec -> swscale -> avutil.
    find_library(LIBAVCODEC_LIBRARY NAMES libavcodec.a PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
    find_library(LIBSWSCALE_LIBRARY NAMES libswscale.a PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
    find_library(LIBAVUTIL_LIBRARY NAMES libavutil.a PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
-    if (NOT LIBAVFORMAT_LIBRARY OR NOT LIBAVCODEC_LIBRARY OR NOT LIBSWSCALE_LIBRARY OR NOT LIBAVUTIL_LIBRARY)
-        message(FATAL_ERROR "Static FFmpeg (libavformat.a/libavcodec.a/libswscale.a/libavutil.a) not found under ${CMAKE_PREFIX_PATH}/lib. Rebuild the deps — FFMPEG builds static-only on macOS.")
+    if (NOT LIBAVCODEC_LIBRARY OR NOT LIBSWSCALE_LIBRARY OR NOT LIBAVUTIL_LIBRARY)
+        message(FATAL_ERROR "Static FFmpeg (libavcodec.a/libswscale.a/libavutil.a) not found under ${CMAKE_PREFIX_PATH}/lib. Rebuild the deps — FFMPEG builds static-only on macOS.")
    endif ()
-    target_link_libraries(libslic3r_gui ${LIBAVFORMAT_LIBRARY} ${LIBAVCODEC_LIBRARY} ${LIBSWSCALE_LIBRARY} ${LIBAVUTIL_LIBRARY})
+    target_link_libraries(libslic3r_gui ${LIBAVCODEC_LIBRARY} ${LIBSWSCALE_LIBRARY} ${LIBAVUTIL_LIBRARY})
    target_include_directories(libslic3r_gui SYSTEM PRIVATE ${CMAKE_PREFIX_PATH}/include)
 elseif (WIN32)
    # Prebuilt shared FFmpeg from the deps install. Windows has no pkg-config,
    # so resolve the import libraries out of the deps prefix directly; the DLLs
    # are copied next to the executable by the top level CMakeLists.
-    find_library(LIBAVFORMAT_LIBRARY NAMES avformat PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
    find_library(LIBAVCODEC_LIBRARY NAMES avcodec PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
    find_library(LIBSWSCALE_LIBRARY NAMES swscale PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
    find_library(LIBAVUTIL_LIBRARY NAMES avutil PATHS ${CMAKE_PREFIX_PATH}/lib NO_DEFAULT_PATH)
    if (NOT LIBAVCODEC_LIBRARY OR NOT LIBSWSCALE_LIBRARY OR NOT LIBAVUTIL_LIBRARY)
        message(FATAL_ERROR "FFmpeg (avcodec/swscale/avutil) not found under ${CMAKE_PREFIX_PATH}/lib. Rebuild the deps.")
    endif ()
-    target_link_libraries(libslic3r_gui ${LIBAVFORMAT_LIBRARY} ${LIBAVCODEC_LIBRARY} ${LIBSWSCALE_LIBRARY} ${LIBAVUTIL_LIBRARY})
+    target_link_libraries(libslic3r_gui ${LIBAVCODEC_LIBRARY} ${LIBSWSCALE_LIBRARY} ${LIBAVUTIL_LIBRARY})
    target_include_directories(libslic3r_gui SYSTEM PRIVATE ${CMAKE_PREFIX_PATH}/include)
 else ()
    pkg_check_modules(LIBAV REQUIRED IMPORTED_TARGET
-        libavformat
        libavcodec
        libswscale
        libavutil
@@ -45,25 +45,6 @@ int AVVideoDecoder::open(Bambu_StreamInfo const &info)
    return 0;
 }

-int AVVideoDecoder::open(AVCodecParameters const &parameters)
-{
-    if (avcodec_parameters_to_context(codec_ctx_, &parameters) < 0)
-        return -1;
-
-    auto codec = avcodec_find_decoder(codec_ctx_->codec_id);
-    if (codec == nullptr) {
-        fprintf(stderr, "AVVideoDecoder: unsupported codec!\n");
-        return -1;
-    }
-    if (avcodec_open2(codec_ctx_, codec, nullptr) < 0) {
-        fprintf(stderr, "AVVideoDecoder: could not open codec\n");
-        return -1;
-    }
-
-    frame_ = av_frame_alloc();
-    return frame_ == nullptr ? -1 : 0;
-}
-
 int AVVideoDecoder::decode(const Bambu_Sample &sample)
 {
    int ret = -1;
@@ -90,14 +71,6 @@ int AVVideoDecoder::decode(const Bambu_Sample &sample)
    return ret;
 }

-int AVVideoDecoder::decode(const AVPacket &packet)
-{
-    int ret = avcodec_send_packet(codec_ctx_, &packet);
-    if (ret == 0)
-        got_frame_ = avcodec_receive_frame(codec_ctx_, frame_) == 0;
-    return ret;
-}
-
 int AVVideoDecoder::flush()
 {
    int ret = avcodec_send_packet(codec_ctx_, nullptr);
@@ -23,10 +23,8 @@ public:

 public:
    int  open(Bambu_StreamInfo const &info);
-    int  open(AVCodecParameters const &parameters);

    int  decode(Bambu_Sample const &sample);
-    int  decode(AVPacket const &packet);

    int  flush();

@@ -36,14 +34,6 @@ public:

    bool toWxBitmap(wxBitmap &bitmap, wxSize const & size);

-    // Native size of the most recently decoded frame, or an unspecified size if
-    // nothing has decoded yet. Lets a caller learn the video dimensions when the
-    // container/probe could not report them up front.
-    wxSize decoded_frame_size() const
-    {
-        return got_frame_ && frame_ ? wxSize{frame_->width, frame_->height} : wxSize{};
-    }
-
 private:
    AVCodecContext *codec_ctx_ = nullptr;
    AVFrame *       frame_     = nullptr;
@@ -328,7 +328,7 @@ void SelectMObjectPopup::update_user_devices()
    }

    m_bind_machine_list.clear();
-    m_bind_machine_list = dev->get_my_machine_list(dev->get_current_printer_agent_id());
+    m_bind_machine_list = dev->get_my_machine_list();

    //sort list
    std::vector<std::pair<std::string, MachineObject*>> user_machine_list;
@@ -8,7 +8,6 @@
 #include "libslic3r/Print.hpp"

 #include "DeviceCore/DevConfig.h"
-#include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevExtruderSystem.h"
 #include "DeviceCore/DevFilaBlackList.h"
 #include "DeviceCore/DevFilaSystem.h"
@@ -1648,8 +1647,18 @@ bool CalibrationPresetPage::is_blocking_printing()
    if (obj_ == nullptr) return true;

    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
-    const auto source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);
-    return !DevPrinterConfigUtil::is_printer_model_compatible(source_model, *obj_);
+    auto source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);
+    auto target_model = obj_->printer_type;
+
+    if (source_model != target_model) {
+        std::vector<std::string> compatible_machine = obj_->get_compatible_machine();
+        vector<std::string>::iterator it = find(compatible_machine.begin(), compatible_machine.end(), source_model);
+        if (it == compatible_machine.end()) {
+            return true;
+        }
+    }
+
+    return false;
 }

 bool CalibrationPresetPage::is_nozzle_info_synced() const
@@ -28,6 +28,7 @@ wxEND_EVENT_TABLE()

 wxDEFINE_EVENT(EVT_VCAMERA_SWITCH, wxMouseEvent);
 wxDEFINE_EVENT(EVT_SDCARD_ABSENT_HINT, wxCommandEvent);
+wxDEFINE_EVENT(EVT_CAM_SOURCE_CHANGE, wxCommandEvent);

 #define CAMERAPOPUP_CLICK_INTERVAL 20

@@ -101,6 +102,34 @@ CameraPopup::CameraPopup(wxWindow *parent)
        top_sizer->Add(0, 0, wxALL, 0);
    }

+    // Orca: custom IP camera source — lets the user point Live Video at any camera URL (Orca feature; not in the reference)
+    m_custom_camera_input_confirm = new Button(m_panel, _L("Enable"));
+    m_custom_camera_input_confirm->SetBackgroundColor(wxColour(38, 166, 154));
+    m_custom_camera_input_confirm->SetBorderColor(wxColour(38, 166, 154));
+    m_custom_camera_input_confirm->SetTextColor(wxColour(0xFFFFFE));
+    m_custom_camera_input_confirm->SetFont(Label::Body_14);
+    m_custom_camera_input_confirm->SetMinSize(wxSize(FromDIP(90), FromDIP(30)));
+    m_custom_camera_input_confirm->SetPosition(wxDefaultPosition);
+    m_custom_camera_input_confirm->SetCornerRadius(FromDIP(12));
+    m_custom_camera_input = new TextInput(m_panel, wxEmptyString, wxEmptyString, wxEmptyString, wxDefaultPosition, wxDefaultSize);
+    m_custom_camera_input->GetTextCtrl()->SetHint(_L("Hostname or IP"));
+    m_custom_camera_input->GetTextCtrl()->SetFont(Label::Body_14);
+    m_custom_camera_hint = new wxStaticText(m_panel, wxID_ANY, _L("Custom camera source"));
+    m_custom_camera_hint->Wrap(-1);
+    m_custom_camera_hint->SetFont(Label::Head_14);
+    m_custom_camera_hint->SetForegroundColour(TEXT_COL);
+
+    m_custom_camera_input_confirm->Bind(wxEVT_BUTTON, &CameraPopup::on_camera_source_changed, this);
+
+    if (!wxGetApp().app_config->get("camera", "custom_source").empty()) {
+        m_custom_camera_input->GetTextCtrl()->SetValue(wxGetApp().app_config->get("camera", "custom_source"));
+        set_custom_cam_button_state(wxGetApp().app_config->get("camera", "enable_custom_source") == "true");
+    }
+
+    top_sizer->Add(m_custom_camera_hint, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT | wxALL, FromDIP(5));
+    top_sizer->Add(0, 0, wxALL, 0);
+    top_sizer->Add(m_custom_camera_input, 2, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxALL, FromDIP(5));
+    top_sizer->Add(m_custom_camera_input_confirm, 1, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT | wxALL, FromDIP(5));
    main_sizer->Add(top_sizer, 0, wxALL, FromDIP(10));

    auto url = wxString(L"https://www.orcaslicer.com/wiki/"); // Orca: neutral wiki link (vendor URL removed)
@@ -155,6 +184,37 @@ void CameraPopup::sdcard_absent_hint()
    GetEventHandler()->ProcessEvent(evt);
 }

+void CameraPopup::on_camera_source_changed(wxCommandEvent &event)
+{
+    if (m_obj && !m_custom_camera_input->GetTextCtrl()->IsEmpty()) {
+        handle_camera_source_change();
+    }
+}
+
+void CameraPopup::handle_camera_source_change()
+{
+    m_custom_camera_enabled = !m_custom_camera_enabled;
+
+    set_custom_cam_button_state(m_custom_camera_enabled);
+
+    wxGetApp().app_config->set("camera", "custom_source", m_custom_camera_input->GetTextCtrl()->GetValue().ToStdString());
+    wxGetApp().app_config->set("camera", "enable_custom_source", m_custom_camera_enabled);
+
+    wxCommandEvent evt(EVT_CAM_SOURCE_CHANGE);
+    evt.SetEventObject(this);
+    GetEventHandler()->ProcessEvent(evt);
+}
+
+void CameraPopup::set_custom_cam_button_state(bool state)
+{
+    m_custom_camera_enabled = state;
+    auto stateColour = state ? wxColour(170, 0, 0) : wxColour(38, 166, 154);
+    auto stateText = state ? "Disable" : "Enable";
+    m_custom_camera_input_confirm->SetBackgroundColor(stateColour);
+    m_custom_camera_input_confirm->SetBorderColor(stateColour);
+    m_custom_camera_input_confirm->SetLabel(_L(stateText));
+}
+
 void CameraPopup::on_switch_recording(wxCommandEvent& event)
 {
    if (!m_obj) return;
@@ -15,12 +15,14 @@
 #include "Widgets/SwitchButton.hpp"
 #include "Widgets/RadioBox.hpp"
 #include "Widgets/PopupWindow.hpp"
+#include "Widgets/TextInput.hpp"

 namespace Slic3r {
 namespace GUI {

 wxDECLARE_EVENT(EVT_VCAMERA_SWITCH, wxMouseEvent);
 wxDECLARE_EVENT(EVT_SDCARD_ABSENT_HINT, wxCommandEvent);
+wxDECLARE_EVENT(EVT_CAM_SOURCE_CHANGE, wxCommandEvent);

 class CameraPopup : public PopupWindow
 {
@@ -51,6 +53,9 @@ protected:
    void on_switch_recording(wxCommandEvent& event);
    void on_set_resolution();
    void sdcard_absent_hint();
+    void on_camera_source_changed(wxCommandEvent& event);
+    void handle_camera_source_change();
+    void set_custom_cam_button_state(bool state);

    wxWindow *  create_item_radiobox(wxString title, wxWindow *parent, wxString tooltip, int padding_left);
    void select_curr_radiobox(int btn_idx);
@@ -71,10 +76,10 @@ private:
    wxStaticText* m_text_liveview_retry;
    SwitchButton* m_switch_liveview_retry;
 #endif //BBL_RELEASE_TO_PUBLIC
-    // wxStaticText* m_custom_camera_hint;
-    // TextInput* m_custom_camera_input;
-    // Button* m_custom_camera_input_confirm;
-    // bool m_custom_camera_enabled{ false };
+    wxStaticText* m_custom_camera_hint;
+    TextInput* m_custom_camera_input;
+    Button* m_custom_camera_input_confirm;
+    bool m_custom_camera_enabled{ false };
    wxStaticText* m_text_resolution;
    wxWindow* m_resolution_options[RESOLUTION_OPTIONS_NUM];
    wxScrolledWindow *m_panel;
@@ -35,9 +35,7 @@ ConnectPrinterDialog::ConnectPrinterDialog(wxWindow *parent, wxWindowID id, cons
    sizer_connect = new wxBoxSizer(wxHORIZONTAL);

    m_textCtrl_code = new TextInput(this, wxEmptyString);
-    // OrcaSonar uses a 12-character base32 access code. Keep this field long
-    // enough for it while retaining the existing validation for LAN codes.
-    m_textCtrl_code->GetTextCtrl()->SetMaxLength(12);
+    m_textCtrl_code->GetTextCtrl()->SetMaxLength(10);
    m_textCtrl_code->SetFont(Label::Body_14);
    m_textCtrl_code->SetCornerRadius(FromDIP(5));
    m_textCtrl_code->SetSize(wxSize(FromDIP(330), FromDIP(40)));
@@ -1,7 +1,5 @@
 #include "DevConfigUtil.h"

-#include "slic3r/GUI/DeviceManager.hpp"
-
 #include <wx/dir.h>
 #include <boost/filesystem/operations.hpp>
 #include "../I18N.hpp"
@@ -43,19 +41,6 @@ static void _toolhead_translation_markers()

 std::string DevPrinterConfigUtil::m_resource_file_path = "";

-bool DevPrinterConfigUtil::is_printer_model_compatible(const std::string& source_model, MachineObject& machine)
-{
-    const std::string& target_model = machine.printer_type;
-    if (is_optional_printer_model_id(source_model) || is_optional_printer_model_id(target_model))
-        return true;
-
-    if (source_model == target_model)
-        return true;
-
-    const auto compatible_machine = machine.get_compatible_machine();
-    return std::find(compatible_machine.begin(), compatible_machine.end(), source_model) != compatible_machine.end();
-}
-

 std::map<std::string, std::string> DevPrinterConfigUtil::get_all_model_id_with_name()
 {
@@ -420,4 +405,4 @@ std::string DevPrinterConfigUtil::get_toolhead_display_name(
    return result;
 }

-};
+};
@@ -25,8 +25,6 @@
 namespace Slic3r
 {

-class MachineObject;
-
 /// Toolhead component type (extruder / nozzle / hotend)
 enum class ToolHeadComponent {
    Extruder,
@@ -61,10 +59,6 @@ public:
    /*printer*/
    // info
    static std::map<std::string, std::string> get_all_model_id_with_name();
-    // A printer agent may not know the physical model. Keep that case optional so
-    // model compatibility checks do not turn missing identity into a hard error.
-    static bool is_printer_model_compatible(const std::string& source_model, MachineObject& machine);
-    static bool is_optional_printer_model_id(const std::string& model_id) { return model_id.empty(); }
    static std::string get_printer_type(const std::string& type_str) { return get_value_from_config<std::string>(type_str, "printer_type"); }
    static std::string get_printer_display_name(const std::string& type_str) { return get_value_from_config<std::string>(type_str, "display_name"); }
    static std::string get_printer_series_str(std::string type_str) { return get_value_from_config<std::string>(type_str, "printer_series"); }
@@ -233,4 +227,4 @@ static std::string _parse_printer_type(const std::string &type_str)
    return type_str;
 }

-};// namespace Slic3r
+};// namespace Slic3r
@@ -762,9 +762,9 @@ void DevFilaSystemParser::ParseV1_0(const json& jj, MachineObject* obj, DevFilaS
                            {
                                curr_tray->remain = -1;
                            }
-                            // The tray objects are reused across status updates. Reset this
-                            // state when a previously empty slot receives a filament again.
-                            curr_tray->is_slot_placeholder = tray_it->contains("tray_slot_placeholder");
+                            if (tray_it->contains("tray_slot_placeholder")) {
+                                curr_tray->is_slot_placeholder = true;
+                            }
                            int ams_id_int = 0;
                            int tray_id_int = 0;
                            try
@@ -999,4 +999,4 @@ void DevFilaSystemParser::ParseAgentFilament(const json& data, MachineObject* ob
    }
 }

-}
+}
@@ -3,7 +3,6 @@
 #include <exception>

 #include "DevManager.h"
-#include "CloudProvider.hpp"
 #include "DevUtil.h"

 // TODO: remove this include
@@ -15,8 +14,6 @@

 #include "libslic3r/Time.hpp"

-#include "IPrinterAgent.hpp"
-
 using namespace nlohmann;

 namespace {
@@ -267,10 +264,6 @@ namespace Slic3r
            /* update userMachineList info */
            auto it = userMachineList.find(dev_id);
            if (it != userMachineList.end()) {
-                // A reused entry may have been created while another printer agent was active.
-                // The response was obtained through the current agent, so move ownership with
-                // the entry; otherwise agent-scoped lists hide it after a preset switch.
-                it->second->printer_agent_id = get_current_printer_agent_id();
                if (it->second->get_dev_ip() != dev_ip ||
                    it->second->bind_state != bind_state ||
                    it->second->bind_sec_link != sec_link ||
@@ -301,9 +294,6 @@ namespace Slic3r
                // update properties
                /* ip changed */
                obj = it->second;
-                // A reused LAN entry may have been discovered while another printer agent was
-                // active. The current discovery message establishes ownership for this agent.
-                obj->printer_agent_id = get_current_printer_agent_id();

                if (obj->get_dev_ip().compare(dev_ip) != 0) {
                    if ( connection_name.empty() ) {
@@ -415,9 +405,6 @@ namespace Slic3r
        auto           it = localMachineList.find(machine.dev_id);
        if (it != localMachineList.end()) {
            obj = it->second;
-            // insert_local_device is called by the active agent, so a reused entry must follow
-            // that agent as well; otherwise the agent-scoped printer list hides it.
-            obj->printer_agent_id = get_current_printer_agent_id();
        } else {
            obj = new MachineObject(this, m_agent, machine.dev_name, machine.dev_id, machine.dev_ip);
            obj->printer_agent_id = get_current_printer_agent_id();
@@ -510,7 +497,7 @@ namespace Slic3r

    MachineObject* DeviceManager::get_my_machine(std::string dev_id)
    {
-        auto list = get_my_machine_list(get_current_printer_agent_id());
+        auto list = get_my_machine_list();
        auto it = list.find(dev_id);
        if (it != list.end())
        {
@@ -547,15 +534,25 @@ namespace Slic3r
        OnSelectedMachineChanged(previous_selected_machine, selected_machine);
    }

-    void DeviceManager::clear_other_devices()
+    void DeviceManager::clear_other_devices(const std::string& target_agent_id)
    {
-        // Device entries are now scoped by printer_agent_id when they are presented. Keep
-        // agent-owned discoveries across a switch so agents without automatic discovery (and
-        // plugins whose devices have not received an access code yet) do not lose their list.
-        // Entries without an owner are legacy/unscoped and cannot safely be shown.
+        // why: on agent swap, keep "My Devices" but drop the transient "Other Devices"
+        // Those belong to the previous agent's network scan; the new agent's start_discovery re-populates its own.
+        //
+        // Also drop "My Devices" stamped by a different agent than the one we're swapping to
+        // (target_agent_id, passed by the caller since the live agent hasn't been repointed yet
+        // at this point): otherwise a device first discovered under agent A survives every swap
+        // with a stale printer_agent_id, stays hidden from every agent's filtered list, and only
+        // gets re-tagged if something happens to delete and re-create it (e.g. account logout).
+        // Dropping it here instead lets the new agent's start_discovery re-insert and re-stamp it
+        // like any other fresh device.
+        const auto my = get_my_machine_list();
        for (auto it = localMachineList.begin(); it != localMachineList.end();)
        {
-            if (!it->second || it->second->printer_agent_id.empty())
+            const bool is_my_device = my.find(it->first) != my.end();
+            const bool agent_mismatch = !target_agent_id.empty() && it->second &&
+                                         it->second->printer_agent_id != target_agent_id;
+            if (!is_my_device || agent_mismatch)
            {
                delete it->second;
                it = localMachineList.erase(it);
@@ -571,22 +568,8 @@ namespace Slic3r
    {
        BOOST_LOG_TRIVIAL(info) << "set_selected_machine=" << dev_id
            << " cur_selected=" << selected_machine;
-        auto my_machine_list = get_my_machine_list(get_current_printer_agent_id());
+        auto my_machine_list = get_my_machine_list();
        auto it = my_machine_list.find(dev_id);
-        BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: set_selected_machine lookup dev_id=" << dev_id
-                                << " found=" << (it != my_machine_list.end())
-                                << " my_machine_count=" << my_machine_list.size()
-                                << " current_agent=" << get_current_printer_agent_id()
-                                << " provider=" << GUI::wxGetApp().get_printer_cloud_provider();
-        if (it != my_machine_list.end() && it->second) {
-            BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: target machine dev_id=" << it->second->get_dev_id()
-                                    << " printer_agent_id=" << it->second->printer_agent_id
-                                    << " connection_type=" << it->second->connection_type()
-                                    << " dev_connection_type=" << it->second->dev_connection_type;
-        } else if (!dev_id.empty()) {
-            BOOST_LOG_TRIVIAL(warning) << "Orca diagnostic: target machine was not found in the current agent's machine list";
-            return false;
-        }

        // disconnect last if dev_id difference from previous one
        auto last_selected = my_machine_list.find(selected_machine);
@@ -597,9 +580,7 @@ namespace Slic3r
                m_agent->disconnect_printer();
            }
            else if (last_selected->second->connection_type() == "cloud") {
-                const int result = m_agent->set_user_selected_machine("");
-                BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: cleared previous cloud selection dev_id="
-                                        << selected_machine << " result=" << result;
+                m_agent->set_user_selected_machine("");
            }
        }

@@ -651,9 +632,7 @@ namespace Slic3r
                    {
                        // diff dev_id, cloud => set_user_selected_machine(new)
                        BOOST_LOG_TRIVIAL(info) << "set_selected_machine: select new cloud machine, dev_id =" << dev_id;
-                        const int result = m_agent->set_user_selected_machine(dev_id);
-                        BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: set new cloud selection dev_id="
-                                                << dev_id << " result=" << result;
+                        m_agent->set_user_selected_machine(dev_id);
                        it->second->reset();
                    }
                    else
@@ -681,8 +660,6 @@ namespace Slic3r

        selected_machine = dev_id;
        record_user_last_machine(selected_machine);
-        BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: DeviceManager selection complete selected_machine="
-                                << selected_machine;
        return true;
    }

@@ -713,9 +690,7 @@ namespace Slic3r
            dev_list.push_back(it->first);
            BOOST_LOG_TRIVIAL(trace) << "add_user_subscribe: " << it->first;
        }
-        const int result = m_agent->add_subscribe(dev_list);
-        BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: add_user_subscribe count=" << dev_list.size()
-                                << " result=" << result;
+        m_agent->add_subscribe(dev_list);
    }


@@ -728,9 +703,7 @@ namespace Slic3r
            dev_list.push_back(it->first);
            BOOST_LOG_TRIVIAL(trace) << "del_user_subscribe: " << it->first;
        }
-        const int result = m_agent->del_subscribe(dev_list);
-        BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: del_user_subscribe count=" << dev_list.size()
-                                << " result=" << result;
+        m_agent->del_subscribe(dev_list);
    }

    void DeviceManager::subscribe_device_list(std::vector<std::string> dev_list)
@@ -849,23 +822,7 @@ namespace Slic3r
        try
        {
            json j = json::parse(body);
-
-            const bool has_request_context = j.contains("provider") && j.contains("agent_id") && j.contains("generation");
-            const std::string provider = j.contains("provider") ? j["provider"].get<std::string>()
-                                                                   : GUI::wxGetApp().get_printer_cloud_provider();
-            const std::string agent_id = j.contains("agent_id") ? j["agent_id"].get<std::string>()
-                                                                  : get_current_printer_agent_id();
-            const std::uint64_t generation = j.value("generation", std::uint64_t(0));
-
-            if (has_request_context &&
-                (provider != GUI::wxGetApp().get_printer_cloud_provider() ||
-                 agent_id != get_current_printer_agent_id() ||
-                 generation != (m_agent ? m_agent->get_user_machine_list_generation() : 0))) {
-                BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << ": ignoring stale response provider="
-                                         << provider << " agent_id=" << agent_id
-                                         << " generation=" << generation;
-                return;
-            }
+            const std::string provider = GUI::wxGetApp().get_printer_cloud_provider();

 #if !BBL_RELEASE_TO_PUBLIC
            BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << j;
@@ -888,14 +845,11 @@ namespace Slic3r
                        /* update field */
                        obj = iter->second;
                        obj->set_dev_id(dev_id);
-                        // A device can be rediscovered by a different agent after a preset
-                        // switch while retaining the same MachineObject instance.
-                        obj->printer_agent_id = agent_id;
                    }
                    else
                    {
                        obj = new MachineObject(this, m_agent, "", "", "");
-                        obj->printer_agent_id = agent_id;
+                        obj->printer_agent_id = get_current_printer_agent_id();
                        if (m_agent)
                        {
                            obj->set_bind_status(m_agent->get_user_name(provider));
@@ -910,12 +864,6 @@ namespace Slic3r

                    if (!obj) continue;

-                    // Orca cloud printers are only ever delivered through this REST
-                    // account list; tag them so DeviceManager's cloud/lan branches
-                    // (subscribe + deselect in set_selected_machine) treat them right.
-                    if (provider == ORCA_CLOUD_PROVIDER)
-                        obj->dev_connection_type = "cloud";
-
                    if (!elem["dev_id"].is_null())
                        obj->set_dev_id(elem["dev_id"].get<std::string>());
                    if (!elem["dev_name"].is_null())
@@ -947,12 +895,6 @@ namespace Slic3r
                        acc_code.erase(std::remove(acc_code.begin(), acc_code.end(), '\n'), acc_code.end());
                        obj->set_access_code(acc_code);
                    }
-
-                    BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: parsed cloud machine dev_id=" << dev_id
-                                            << " name=" << obj->get_dev_name()
-                                            << " agent_id=" << obj->printer_agent_id
-                                            << " connection_type=" << obj->connection_type()
-                                            << " online=" << obj->m_is_online;
                }

                //remove MachineObject from userMachineList
@@ -968,9 +910,6 @@ namespace Slic3r
                        iterat++;
                    }
                }
-                BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: parse_user_print_info complete provider=" << provider
-                                        << " parsed_count=" << new_list.size()
-                                        << " stored_count=" << userMachineList.size();
            }
        }
        catch (std::exception& e)
@@ -987,14 +926,10 @@ namespace Slic3r
        unsigned int http_code;
        std::string body;
        int result = m_agent->get_user_print_info(&http_code, &body, provider);
-        BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: get_user_print_info provider=" << provider
-                                << " result=" << result << " http_code=" << http_code
-                                << " body_bytes=" << body.size();
        if (result == 0)
        {
            // parse_user_print_info and on_machine_alive (SSDP for discovery) both mutate the same userMachineList map.
            // on_machine_alive mutates the map on the UI thread, do the same for parse_user_print_info.
-            BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: queueing parse_user_print_info on UI thread";
            Slic3r::GUI::wxGetApp().CallAfter([this, body]() { parse_user_print_info(body); });
        }
    }
@@ -74,9 +74,10 @@ public:
    void erase_user_machine(std::string dev_id) { userMachineList.erase(dev_id); }
    void clean_user_info(bool keep_local_selection = false);

-    // Retain agent-owned LAN discoveries across a switch; the active-agent list filter keeps
-    // entries from other agents hidden while allowing them to reappear when switched back.
-    void clear_other_devices();
+    // target_agent_id: id of the agent being swapped to (empty = no agent-mismatch check,
+    // just the original "drop Other Devices" behavior). Pass the incoming agent's id, not the
+    // live one - this runs before the live agent is repointed.
+    void clear_other_devices(const std::string& target_agent_id = "");

    void load_last_machine();
    void update_user_machine_list_info(const std::string& provider);
@@ -153,4 +154,4 @@ public:
 protected:
    virtual void on_timer(wxTimerEvent& event);
 };
-};
+};
@@ -53,7 +53,6 @@
 #include "DeviceCore/DevStatus.h"
 #include "DeviceCore/DevUpgrade.h"

-#include "IPrinterAgent.hpp"

 #define CALI_DEBUG
 #define MINUTE_30 1800000    //ms
@@ -374,22 +373,8 @@ NozzleVolumeType convert_to_nozzle_type(const std::string &str)
 wxString MachineObject::get_printer_type_display_str() const
 {
    std::string display_name = DevPrinterConfigUtil::get_printer_display_name(printer_type);
-
-    // Bambu printers use m_resource_file_path + "/printers/" + type_str + ".json", which is a semantic that only works for their profiles.
-    // For any other profile, we can simply consult preset bundle if the model_id exists. 
-    if (display_name.empty()) {
-        for (const auto& [vendor_id, vendor] : GUI::wxGetApp().preset_bundle->vendors) {
-            for (const auto& model : vendor.models) {
-                if (printer_type == model.model_id)
-                    display_name = model.name;
-            }
-        }
-    }
-
    if (!display_name.empty())
        return display_name;
-    else if (printer_type == "orcasonar")
-        return "OrcaSonar Printer";
    else
        return _L("Unknown");
 }
@@ -1356,6 +1341,7 @@ int MachineObject::command_get_access_code() {
    return this->publish_json(j);
 }

+
 int MachineObject::command_request_push_all(bool request_now)
 {
    auto curr_time = std::chrono::system_clock::now();
@@ -1487,17 +1473,26 @@ int MachineObject::command_upgrade_module(std::string url, std::string module_ty

 int MachineObject::command_xyz_abs()
 {
-    return command_with_dialog(m_agent->command_xyz_abs(get_dev_id(), MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    return this->publish_gcode("G90 \n");
 }

 int MachineObject::command_auto_leveling()
 {
-    return command_with_dialog(m_agent->command_auto_leveling(get_dev_id(), MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    return this->publish_gcode("G29 \n");
 }

 int MachineObject::command_go_home()
 {
-    return command_with_dialog(m_agent->command_go_home(get_dev_id(), this->is_in_printing(), m_support_mqtt_homing, MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    if (m_support_mqtt_homing)
+    {
+        json j;
+        j["print"]["command"] = "back_to_center";
+        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
+        return this->publish_json(j);
+    }
+
+    // gcode command
+    return this->is_in_printing() ? this->publish_gcode("G28 X\n") : this->publish_gcode("G28 \n");
 }

 int MachineObject::command_task_partskip(std::vector<int> part_ids)
@@ -1619,12 +1614,23 @@ int MachineObject::command_stop_buzzer()

 int MachineObject::command_set_bed(int temp)
 {
-    return command_with_dialog(m_agent->command_set_bed(get_dev_id(), temp, m_support_mqtt_bet_ctrl, MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    if (m_support_mqtt_bet_ctrl)
+    {
+        json j;
+        j["print"]["command"] = "set_bed_temp";
+        j["print"]["temp"] = temp;
+        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
+        return this->publish_json(j);
+    }
+
+    std::string gcode_str = (boost::format("M140 S%1%\n") % temp).str();
+    return this->publish_gcode(gcode_str);
 }

 int MachineObject::command_set_nozzle(int temp)
 {
-    return command_with_dialog(m_agent->command_set_nozzle(get_dev_id(), temp, MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    std::string gcode_str = (boost::format("M104 S%1%\n") % temp).str();
+    return this->publish_gcode(gcode_str);
 }

 int MachineObject::command_set_nozzle_new(int nozzle_id, int temp)
@@ -1729,7 +1735,9 @@ int MachineObject::command_ams_user_settings(bool start_read_opt, bool tray_read

 int MachineObject::command_ams_calibrate(int ams_id)
 {
-    return command_with_dialog(m_agent->command_ams_calibrate(get_dev_id(), ams_id, MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    std::string gcode_cmd = (boost::format("M620 C%1% \n") % ams_id).str();
+    BOOST_LOG_TRIVIAL(trace) << "ams_debug: gcode_cmd" << gcode_cmd;
+    return this->publish_gcode(gcode_cmd);
 }

 int MachineObject::command_ams_filament_settings(int ams_id, int slot_id, std::string filament_id, std::string setting_id, std::string tray_color, std::string tray_type, int nozzle_temp_min, int nozzle_temp_max)
@@ -1767,7 +1775,9 @@ int MachineObject::command_ams_filament_settings(int ams_id, int slot_id, std::s

 int MachineObject::command_ams_refresh_rfid(std::string tray_id)
 {
-    return command_with_dialog(m_agent->command_ams_refresh_rfid(get_dev_id(), tray_id, MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    std::string gcode_cmd = (boost::format("M620 R%1% \n") % tray_id).str();
+    BOOST_LOG_TRIVIAL(trace) << "ams_debug: gcode_cmd" << gcode_cmd;
+    return this->publish_gcode(gcode_cmd);
 }

 int MachineObject::command_ams_refresh_rfid2(int ams_id,  int slot_id)
@@ -1780,16 +1790,12 @@ int MachineObject::command_ams_refresh_rfid2(int ams_id,  int slot_id)
    return this->publish_json(j);
 }

-int MachineObject::command_start_camera()
-{
-    if (!m_agent) return -1;
-    return m_agent->command_start_camera(get_dev_id());
-}
-

 int MachineObject::command_ams_select_tray(std::string tray_id)
 {
-    return command_with_dialog(m_agent->command_ams_select_tray(get_dev_id(), tray_id, MachineObject::m_sequence_id++, is_lan_mode_printer()));
+    std::string gcode_cmd = (boost::format("M620 P%1% \n") % tray_id).str();
+    BOOST_LOG_TRIVIAL(trace) << "ams_debug: gcode_cmd" << gcode_cmd;
+    return this->publish_gcode(gcode_cmd);
 }

 int MachineObject::command_ams_control(std::string action)
@@ -1948,9 +1954,47 @@ int MachineObject::command_ams_air_print_detect(bool air_print_detect)

 int MachineObject::command_axis_control(std::string axis, double unit, double input_val, int speed)
 {
-    return command_with_dialog(m_agent->command_axis_control(get_dev_id(), axis, unit, input_val, speed, is_core_xy(),
-                                                             m_support_mqtt_axis_control, MachineObject::m_sequence_id++,
-                                                             is_lan_mode_printer()));
+    if (m_support_mqtt_axis_control)
+    {
+        int dir = input_val > 0 ? 1 : -1;
+        // i3-arch printers move the bed for Y/Z, so the on-screen direction is
+        // reversed — same negation the g-code fallback below applies.
+        if (!is_core_xy() && (axis.compare("Y") == 0 || axis.compare("Z") == 0)) {
+            dir = -dir;
+        }
+
+        json j;
+        j["print"]["command"] = "xyz_ctrl";
+        j["print"]["axis"] = axis;
+        j["print"]["dir"] = dir;
+        j["print"]["mode"] = (std::abs(input_val) >= 10) ? 1 : 0;
+        j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
+        return this->publish_json(j);
+    }
+
+    double value = input_val;
+    if (!is_core_xy()) {
+        if ( axis.compare("Y") == 0
+            || axis.compare("Z")  == 0) {
+            value = -1.0 * input_val;
+        }
+    }
+
+    char cmd[256];
+    if (axis.compare("X") == 0
+        || axis.compare("Y") == 0
+        || axis.compare("Z") == 0) {
+        sprintf(cmd, "M211 S \nM211 X1 Y1 Z1\nM1002 push_ref_mode\nG91 \nG1 %s%0.1f F%d\nM1002 pop_ref_mode\nM211 R\n", axis.c_str(), value * unit, speed);
+    }
+    else if (axis.compare("E") == 0) {
+        sprintf(cmd, "M83 \nG0 %s%0.1f F%d\n", axis.c_str(), value * unit, speed);
+    }
+    else {
+        return -1;
+    }
+
+
+    return this->publish_gcode(cmd);
 }

 int MachineObject::command_extruder_control(int nozzle_id, double val)
@@ -2575,12 +2619,7 @@ void MachineObject::reset()
            vt_slot.erase(vt_slot.begin() + 1);
        }
    }
-    // why: reset reuses MachineObject, so release its lazy subtask
-    // before dropping the pointer to prevent reconnect leaks.
-    if (subtask_) {
-        delete subtask_;
-        subtask_ = nullptr;
-    }
+    subtask_ = nullptr;
    has_extra_flow_type = false;
    m_partskip_ids.clear();
 }
@@ -2590,24 +2629,10 @@ void MachineObject::set_print_state(std::string status)
    print_status = status;
 }

-// why: printer agents can report progress without BBL cloud task identity.
-void MachineObject::update_print_progress(const json& value)
-{
-    if (value.is_string())
-        mc_print_percent = stoi(value.get<std::string>());
-    else if (value.is_number_integer())
-        mc_print_percent = value.get<int>();
-    else
-        return;
-
-    if (BBLSubTask* curr_task = get_subtask())
-        curr_task->task_progress = mc_print_percent;
-}
-
 int MachineObject::connect(bool use_openssl)
 {
    if (get_dev_ip().empty()) return -1;
-    std::string username = m_agent ? m_agent->default_lan_username() : std::string();
+    std::string username = "bblp";
    std::string password = get_access_code();

    if (m_agent) {
@@ -2717,14 +2742,6 @@ int MachineObject::publish_json(const json& json_item, int qos, int flag)
        BOOST_LOG_TRIVIAL(error) << "publish_json: " << json_item.dump() << " code: " << rtn;
    }

-    // why: the agent is the only thing that knows what it can translate, so it reports
-    // not-supported in its return value and this - the single funnel every command_* builder
-    // passes through - is the one place that turns it into something the user sees. No list of
-    // unsupported commands is needed anywhere: an agent that has no case for a command says so.
-    if (rtn == ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED || rtn == ORCA_NETWORK_ERR_CAP_NOT_AVAILABLE) {
-        show_unsupported_dlg(rtn);
-    }
-
    return rtn;
 }

@@ -3029,13 +3046,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
            }
        } catch (...) {}

-        try {
-            if (j.contains("info"))
-                parse_new_info2(j["info"]);
-        } catch (...) {
-            BOOST_LOG_TRIVIAL(error) << "parse_json: failed to parse OrcaSonar capability info";
-        }
-
        try {
            if (auto ptr = m_fila_system->GetAmsFirmwareSwitch().lock()) {
                ptr->ParseFirmwareSwitch(j);
@@ -3288,7 +3298,10 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                        print_type = jj["print_type"].get<std::string>();
                    }
                    if (jj.contains("mc_percent")) {
-                        update_print_progress(jj["mc_percent"]);
+                        if (jj["mc_percent"].is_string())
+                            mc_print_percent = stoi(j["print"]["mc_percent"].get<std::string>());
+                        else if (jj["mc_percent"].is_number_integer())
+                            mc_print_percent = j["print"]["mc_percent"].get<int>();
                    }
                    if (jj.contains("mc_print_sub_stage")) {
                        if (jj["mc_print_sub_stage"].is_number_integer())
@@ -3458,9 +3471,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                            this->task_id_ = jj["task_id"].get<std::string>();
                        }

-                        if (jj.contains("thumbnail_url") && jj["thumbnail_url"].is_string())
-                            m_agent_thumbnail_url = jj["thumbnail_url"].get<std::string>();
-
                        if (jj.contains("job_attr")) {
                            int jobAttr = jj["job_attr"].get<int>();
                            jobState_ =  get_flag_bits(jobAttr, 4, 4);
@@ -3506,6 +3516,7 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                        update_slice_info(jj["project_id"].get<std::string>(), jj["profile_id"].get<std::string>(), jj["subtask_id"].get<std::string>(), plate_index);
                        BBLSubTask* curr_task = get_subtask();
                        if (curr_task) {
+                            curr_task->task_progress = mc_print_percent;
                            curr_task->printing_status = print_status;
                            curr_task->task_id = jj["subtask_id"].get<std::string>();
                        }
@@ -3808,7 +3819,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                                        has_ipcam = true;
                                    } else {
                                        has_ipcam = false;
-                                        webcam_stream_url.clear();
                                    }
                                }
                                if (ipcam.contains("resolution")) {
@@ -3843,9 +3853,6 @@ int MachineObject::parse_json(std::string tunnel, std::string payload, bool key_
                                    liveview_local = local_rtsp_url.empty() ? LVL_None : local_rtsp_url == "disable"
                                            ? LVL_Disable : boost::algorithm::starts_with(local_rtsp_url, "rtsps") ? LVL_Rtsps : LVL_Rtsp;
                                }
-                                if (ipcam.contains("stream_url") && ipcam["stream_url"].is_string()) {
-                                    webcam_stream_url = ipcam["stream_url"].get<std::string>();
-                                }
                                if (ipcam.contains("tutk_server")) {
                                    tutk_state = ipcam["tutk_server"].get<std::string>();
                                }
@@ -5425,86 +5432,6 @@ void MachineObject::parse_new_info(json print)
    }
 }

-void MachineObject::parse_new_info2(const json& info)
-{
-    if (!info.is_object() || info.value("command", "") != "get_capabilities")
-        return;
-
-    const auto capabilities_it = info.find("capabilities");
-    if (capabilities_it == info.end() || !capabilities_it->is_object())
-        return;
-    const auto flags_it = capabilities_it->find("flags");
-    if (flags_it == capabilities_it->end() || !flags_it->is_object())
-        return;
-
-    const json& flags = *flags_it;
-    BOOST_LOG_TRIVIAL(info) << "parse_new_info2: OrcaSonar capability flags=" << flags.dump();
-
-    auto parse_bool = [&flags](const char* name, bool& target) {
-        const auto it = flags.find(name);
-        if (it != flags.end() && it->is_boolean())
-            target = it->get<bool>();
-    };
-
-    parse_bool("support_send_to_sd", is_support_send_to_sdcard);
-    parse_bool("support_filament_backup", is_support_filament_backup);
-    parse_bool("support_update_remain", is_support_update_remain);
-    parse_bool("support_auto_recovery_step_loss", is_support_auto_recovery_step_loss);
-    parse_bool("support_ams_humidity", is_support_ams_humidity);
-    parse_bool("support_prompt_sound", is_support_prompt_sound);
-    parse_bool("support_filament_tangle_detect", is_support_filament_tangle_detect);
-    parse_bool("support_1080dpi", is_support_1080dpi);
-    parse_bool("support_cloud_print_only", is_support_cloud_print_only);
-    parse_bool("support_command_ams_switch", is_support_command_ams_switch);
-    parse_bool("support_mqtt_alive", is_support_mqtt_alive);
-    parse_bool("support_motor_noise_cali", is_support_motor_noise_cali);
-    parse_bool("support_timelapse", is_support_timelapse);
-    parse_bool("support_user_preset", is_support_user_preset);
-    parse_bool("support_refresh_nozzle", is_support_refresh_nozzle);
-    parse_bool("support_flow_calibration", is_support_flow_calibration);
-    parse_bool("support_build_plate_marker_detect", is_support_build_plate_marker_detect);
-    parse_bool("support_nozzle_blob_detect", is_support_nozzle_blob_detection);
-
-    if (!m_manager->IsMultiMachineEnabled() && !is_support_agora)
-        parse_bool("support_tunnel_mqtt", is_support_tunnel_mqtt);
-
-    const auto bed_leveling_it = flags.find("support_bed_leveling");
-    if (bed_leveling_it != flags.end() && bed_leveling_it->is_number_integer())
-        is_support_bed_leveling = bed_leveling_it->get<int>();
-
-    auto copy_bool = [&flags](json& target, const char* name) {
-        const auto it = flags.find(name);
-        if (it != flags.end() && it->is_boolean())
-            target[name] = *it;
-    };
-
-    // The capability manifest uses an object for this range, while the legacy
-    // DeviceCore parser consumes a boolean plus a two-element range array.
-    json device_config;
-    copy_bool(device_config, "support_chamber");
-    copy_bool(device_config, "support_first_layer_inspect");
-    copy_bool(device_config, "support_ai_monitoring");
-    copy_bool(device_config, "support_lidar_calibration");
-    const auto chamber_edit_it = flags.find("support_chamber_temp_edit");
-    if (chamber_edit_it != flags.end() && chamber_edit_it->is_boolean()) {
-        device_config["support_chamber_temp_edit"] = *chamber_edit_it;
-    } else if (chamber_edit_it != flags.end() && chamber_edit_it->is_object()) {
-        const auto min_it = chamber_edit_it->find("min");
-        const auto max_it = chamber_edit_it->find("max");
-        if (min_it != chamber_edit_it->end() && max_it != chamber_edit_it->end() && min_it->is_number() && max_it->is_number()) {
-            device_config["support_chamber_temp_edit"]       = true;
-            device_config["support_chamber_temp_edit_range"] = {*min_it, *max_it};
-        }
-    }
-
-    json fan_config;
-    copy_bool(fan_config, "support_aux_fan");
-    copy_bool(fan_config, "support_chamber_fan");
-
-    m_config->ParseConfig(device_config);
-    m_fan->ParseV2_0(fan_config);
-}
-
 static bool is_hex_digit(char c) {
    return std::isxdigit(static_cast<unsigned char>(c)) != 0;
 }
@@ -6010,15 +5937,6 @@ bool MachineObject::HasAms() const
    return m_fila_system->HasAms();
 }

-int MachineObject::command_with_dialog(int cmd_result)
-{
-    if (!m_agent)
-        return -1;
-    if (cmd_result == ORCA_NETWORK_ERR_CMD_NOT_SUPPORTED || cmd_result == ORCA_NETWORK_ERR_CAP_NOT_AVAILABLE)
-        show_unsupported_dlg(cmd_result);
-    return cmd_result;
-}
-
 void change_the_opacity(wxColour& colour)
 {
    if (colour.Alpha() == 255) {
@@ -18,7 +18,6 @@
 #include "boost/bimap/bimap.hpp"
 #include "libslic3r/calib.hpp"
 #include "libslic3r/Utils.hpp"
-#include "slic3r/Utils/PrinterNetworkTypes.hpp"

 #include "DeviceCore/DevDefs.h"
 #include "DeviceCore/DevConfigUtil.h"
@@ -101,6 +100,7 @@ struct DevPrintTaskRatingInfo;
 // given nozzle diameter (mm), bucketed per nozzle size to mirror the printer firmware.
 bool is_stringing_prone_filament(const std::string& filament_id, float nozzle_diameter);

+
 class MachineObject
 {
 private:
@@ -547,12 +547,30 @@ public:
    bool xcam_first_layer_inspector { false };
    time_t  xcam_first_layer_hold_start = 0;
    std::string local_rtsp_url;
-    std::string webcam_stream_url;
    std::string tutk_state;
-    LiveviewLocal liveview_local{ LiveviewLocal::LVL_None };
-    LiveviewRemote liveview_remote{ LiveviewRemote::LVR_None};
-    FileLocal file_local{ FileLocal::FL_None };
-    FileRemote file_remote{ FileRemote::FR_None };
+    enum LiveviewLocal {
+        LVL_None,
+        LVL_Disable,
+        LVL_Local,
+        LVL_Rtsps,
+        LVL_Rtsp
+    } liveview_local{ LVL_None };
+    enum LiveviewRemote {
+        LVR_None,
+        LVR_Tutk,
+        LVR_Agora,
+        LVR_TutkAgora
+    } liveview_remote{ LVR_None };
+    enum FileLocal {
+        FL_None,
+        FL_Local
+    } file_local{ FL_None };
+    enum FileRemote {
+        FR_None,
+        FR_Tutk,
+        FR_Agora,
+        FR_TutkAgora
+    } file_remote{ FR_None };

    enum PlateMakerDectect : int
    {
@@ -690,8 +708,6 @@ public:
    std::string  subtask_id_;
    std::string  job_id_;
    std::string  last_subtask_id_;
-    // note: printer-agent-supplied thumbnail url, empty when the agent supplies none.
-    std::string  m_agent_thumbnail_url;
    BBLSliceInfo* slice_info {nullptr};
    boost::thread* get_slice_info_thread { nullptr };
    boost::thread* get_model_task_thread { nullptr };
@@ -749,7 +765,6 @@ public:
    int command_set_printer_nozzle(std::string nozzle_type, float diameter);
    int command_set_printer_nozzle2(int id, std::string nozzle_type, float diameter);
    int command_get_access_code();
-    int command_start_camera();
    int command_ack_proceed(json& proceed);
    int command_purification_disable();
    int command_dont_remind_next_time(json& mqtt_guard_json);
@@ -879,7 +894,6 @@ public:
    static bool is_in_printing_status(std::string status);

    void set_print_state(std::string status);
-    void update_print_progress(const json& value);

    bool is_connected();
    bool is_connecting();
@@ -947,7 +961,6 @@ public:
    /*for parse new info*/
    bool check_enable_np(const json& print) const;
    void parse_new_info(json print);
-    void parse_new_info2(const json& info);
    int  get_flag_bits(std::string str, int start, int count = 1) const;
    uint32_t get_flag_bits_no_border(std::string str, int start_idx, int count = 1) const;
    int get_flag_bits(int num, int start, int count = 1, int base = 10) const;
@@ -976,7 +989,7 @@ public:
    void command_set_save_remote_print_file_to_storage(bool save);

 private:
-    int command_with_dialog(int cmd_result);
+
    /* xcam door open check*/
    bool is_support_door_open_check = false;
    DoorOpenCheckState xcam_door_open_check  = DoorOpenCheckState::DOOR_OPEN_CHECK_DISABLE;
@@ -3,7 +3,6 @@
 #include "libslic3r/Technologies.hpp"
 #include "libslic3r/Platform.hpp"
 #include "GUI_App.hpp"
-#include "DeviceCore/DevConfigUtil.h"
 #include "BindDialog.hpp"
 #include "DeviceManager.hpp"
 #include "HMS.hpp"
@@ -24,6 +23,7 @@
 #include <boost/locale/encoding_utf.hpp>
 #include <boost/log/detail/native_typeof.hpp>
 #include <libslic3r/Config.hpp>
+#include <mutex>
 #include <slic3r/plugin/PythonPluginInterface.hpp>
 #include <wx/event.h>

@@ -40,11 +40,9 @@
 #include <iterator>
 #include <exception>
 #include <cstdlib>
-#include <mutex>
 #include <regex>
 #include <thread>
 #include <string_view>
-
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
@@ -89,6 +87,7 @@
 #include "libslic3r/Thread.hpp"
 #include "libslic3r/miniz_extension.hpp"
 #include "libslic3r/Utils.hpp"
+#include "libslic3r/Color.hpp"
 #include "slic3r/plugin/PluginManager.hpp"
 #include "slic3r/plugin/host/PluginHostUi.hpp"
 #include "slic3r/plugin/PythonInterpreter.hpp"
@@ -108,18 +107,19 @@
 #include "../Utils/PrintHost.hpp"
 #include "../Utils/Process.hpp"
 #include "../Utils/wxInspectorPlugins/Registration.hpp"
+#include "../Utils/MacDarkMode.hpp"
 #include "../Utils/Http.hpp"
 #include "../Utils/InstanceID.hpp"
 #include "../Utils/UndoRedo.hpp"
 #include "slic3r/Config/Snapshot.hpp"
 #include "Preferences.hpp"
 #include "Tab.hpp"
+#include "SysInfoDialog.hpp"
 #include "UpdateDialogs.hpp"
 #include "Mouse3DController.hpp"
 #include "RemovableDriveManager.hpp"
 #include "InstanceCheck.hpp"
 #ifdef __APPLE__
-#include "../Utils/MacDarkMode.hpp"
 #include "DeepLinkHandlerMac.h"
 #endif
 #include "NotificationManager.hpp"
@@ -128,6 +128,8 @@
 #include "PrintHostDialogs.hpp"
 #include "NetworkPluginDialog.hpp"
 #include "DesktopIntegrationDialog.hpp"
+#include "SendSystemInfoDialog.hpp"
+#include "ParamsDialog.hpp"
 #include "KBShortcutsDialog.hpp"
 #include "DownloadProgressDialog.hpp"
 #include "TroubleshootDialog.hpp"
@@ -138,6 +140,7 @@
 #include "Widgets/ProgressDialog.hpp"

 //BBS: DailyTip and UserGuide Dialog
+#include "WebDownPluginDlg.hpp"
 #include "WebGuideDialog.hpp"
 #include "ReleaseNote.hpp"
 #include "PrivacyUpdateDialog.hpp"
@@ -2382,8 +2385,14 @@ bool GUI_App::is_blocking_printing(MachineObject *obj_)
 {
    DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
    if (!dev) return true;
+    std::string target_model;
    if (obj_ == nullptr) {
        obj_ = dev->get_selected_machine();
+        if (obj_) {
+            target_model = obj_->printer_type;
+        }
+    } else {
+        target_model = obj_->printer_type;
    }

    if (!obj_)
@@ -2394,7 +2403,14 @@ bool GUI_App::is_blocking_printing(MachineObject *obj_)
    PresetBundle *preset_bundle = wxGetApp().preset_bundle;
    std::string    source_model  = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);

-    return !DevPrinterConfigUtil::is_printer_model_compatible(source_model, *obj_);
+    if (source_model != target_model) {
+        std::vector<std::string>      compatible_machine = obj_->get_compatible_machine();
+        vector<std::string>::iterator it                 = find(compatible_machine.begin(), compatible_machine.end(), source_model);
+        if (it == compatible_machine.end()) {
+            return true;
+        }
+    }
+    return false;
 }

 // If formatted for github, plaintext with OpenGL extensions enclosed into <details>.
@@ -3949,16 +3965,20 @@ void GUI_App::set_live_printer_agent(std::shared_ptr<IPrinterAgent> agent)
        m_agent->set_user_selected_machine("");
        // note: belt-and-suspenders (precedent: DeviceManagerRefresher::on_timer)
        dev->OnSelectedMachineLost(); // why: clear stale sidebar sync-status / AMS
-        // why: retain agent-owned LAN discoveries so agents without automatic discovery (for
-        // example the Moonraker-based Qidi/Snapmaker agents) can reuse them after a switch.
-        dev->clear_other_devices();
+        // why: drop stale LAN discoveries; keep My Devices, but only those belonging to the
+        // agent we're about to swap to, so a device stamped by the outgoing agent doesn't
+        // linger hidden - the new agent's start_discovery re-inserts and re-stamps it fresh.
+        // agent is null when clearing the live agent entirely (e.g. plugin unload); there's no
+        // target to filter against then, so fall back to the original "keep all My Devices"
+        // behavior rather than guessing.
+        dev->clear_other_devices(agent ? agent->get_agent_info().id : std::string());
    }

    m_agent->set_printer_agent(agent);
    sidebar().update_all_preset_comboboxes();
 }

-std::string GUI_App::resolve_printer_agent_id(const std::string& stored_id) const
+std::string GUI_App::resolve_printer_agent_id(const std::string& stored_id)
 {
    if (!stored_id.empty())
        return stored_id;
@@ -3994,7 +4014,6 @@ void GUI_App::switch_printer_agent()

    std::string log_dir        = data_dir();
    std::string cloud_agent_id = agent_info.id == BBL_PRINTER_AGENT_ID ? BBL_CLOUD_PROVIDER : ORCA_CLOUD_PROVIDER;
-    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " " << agent_info.id;
    std::shared_ptr<ICloudServiceAgent> cloud_agent = m_agent->get_cloud_agent(cloud_agent_id);

    // Create new printer agent via registry
@@ -4008,10 +4027,8 @@ void GUI_App::switch_printer_agent()
        return;
    }

-    // Compare the registered IDs, not only the implementation pointer. Different registry IDs
-    // may intentionally be backed by the same implementation object (especially for plugins).
-    const auto current_printer_agent = m_agent->get_printer_agent();
-    if (current_printer_agent && current_printer_agent->get_agent_info().id == effective_agent_id) {
+    // The factory caches agents per ID, so an identical pointer means the agent type is unchanged.
+    if (m_agent->get_printer_agent() == new_printer_agent) {
        // Orca: the agent type is unchanged (e.g. switching between two Moonraker/Klipper
        // printer presets), so the selected machine and the agent's cached device_info still
        // point at the previously active printer preset. Re-select the machine when the new
@@ -4976,16 +4993,14 @@ bool GUI_App::is_user_login(const std::string& provider/* = ORCA_CLOUD_PROVIDER*
    return false;
 }

-std::string GUI_App::get_printer_cloud_provider() const
+const std::string& GUI_App::get_printer_cloud_provider() const
 {
-    const std::string agent_id = resolve_printer_agent_id(
-        preset_bundle ? preset_bundle->printers.get_edited_preset().config.opt_string("printer_agent")
-                      : std::string());
-    return agent_id == BBL_PRINTER_AGENT_ID ? BBL_CLOUD_PROVIDER : ORCA_CLOUD_PROVIDER;
+    // Orca todo: this need to be revisted. currently it is mainly used for device manager and related clausses and only bambu machines use them.
+    // 
+    return BBL_CLOUD_PROVIDER;
 }


-
 bool GUI_App::check_login(const std::string& provider/* = ORCA_CLOUD_PROVIDER*/)
 {
    bool result = false;
@@ -23,6 +23,9 @@
 #include <wx/snglinst.h>
 #include <wx/msgdlg.h>

+#include <mutex>
+#include <stack>
+
 //#define BBL_HAS_FIRST_PAGE          1
 #define STUDIO_INACTIVE_TIMEOUT     15*60*1000
 #define LOG_FILES_MAX_NUM           30
@@ -371,7 +374,7 @@ public:
    // Reconcile the live printer agent with the stored preset selection.
    void switch_printer_agent();

-    std::string resolve_printer_agent_id(const std::string& stored_id) const;
+    std::string resolve_printer_agent_id(const std::string& stored_id);
    // ORCA TODO: in the future, bbl presets should specify "bbl" printer agent id
    // then, all resolve and canonical would just be ORCA<->""
    std::string canonical_printer_agent_id(const std::string& picked_id);
@@ -497,7 +500,7 @@ public:
    bool            check_login(const std::string& provider = ORCA_CLOUD_PROVIDER);
    void            get_login_info(const std::string& provider = ORCA_CLOUD_PROVIDER);
    bool            is_user_login(const std::string& provider = ORCA_CLOUD_PROVIDER);
-    std::string      get_printer_cloud_provider() const;
+    const std::string& get_printer_cloud_provider() const;

    void            request_user_login(int online_login = 0, const std::string& provider = ORCA_CLOUD_PROVIDER);
    void            request_user_handle(int online_login = 0, const std::string& provider = ORCA_CLOUD_PROVIDER);
@@ -1,26 +0,0 @@
-#pragma once
-
-#include <wx/mediactrl.h>
-#include <wx/uri.h>
-
-namespace Slic3r { namespace GUI {
-
-class IMediaController
-{
-public:
-    virtual ~IMediaController() = default;
-
-    virtual void Load(wxURI url) = 0;
-
-    virtual void Play() = 0;
-
-    virtual void Stop() = 0;
-
-    virtual wxMediaState GetState() { return wxMediaState{}; }
-
-    virtual int GetLastError() const { return {}; };
-
-    virtual wxSize GetVideoSize() const { return {}; };
-};
-
-}} // namespace Slic3r::GUI
@@ -14,7 +14,6 @@

 #include "slic3r/Utils/FileTransferUtils.hpp"
 #include "slic3r/Utils/BBLNetworkPlugin.hpp"
-#include "NetworkAgent.hpp"

 namespace Slic3r {
 namespace GUI {
@@ -204,7 +203,7 @@ void PrintJob::process(Ctl &ctl)
    params.dev_ip = m_dev_ip;
    params.use_ssl_for_ftp  = m_local_use_ssl_for_ftp;
    params.use_ssl_for_mqtt  = m_local_use_ssl;
-    params.username = m_agent->default_lan_username();
+    params.username = "bblp";
    params.password = m_access_code;

    // check access code and ip address
@@ -126,7 +126,7 @@ void SendJob::process(Ctl &ctl)
    if (m_is_check_mode) {
        PrintParams verify_params;
        verify_params.dev_ip           = m_dev_ip;
-        verify_params.username         = agent->default_lan_username();
+        verify_params.username         = "bblp";
        verify_params.password         = m_access_code;
        verify_params.use_ssl_for_ftp  = m_local_use_ssl_for_ftp;
        verify_params.use_ssl_for_mqtt = m_local_use_ssl;
@@ -211,7 +211,7 @@ void SendJob::process(Ctl &ctl)

    // local print access
    params.dev_ip = m_dev_ip;
-    params.username = agent->default_lan_username();
+    params.username = "bblp";
    params.password = m_access_code;
    params.use_ssl_for_ftp = m_local_use_ssl_for_ftp;
    params.use_ssl_for_mqtt = m_local_use_ssl;
@@ -4352,7 +4352,7 @@ void MainFrame::load_printer_url()
        if (auto *device_manager = wxGetApp().getDeviceManager()) {
            auto *machine = device_manager->get_selected_machine();
            if (!machine) {
-                auto machines = device_manager->get_my_machine_list(device_manager->get_current_printer_agent_id());
+                auto machines = device_manager->get_my_machine_list();
                if (machines.size() == 1)
                    machine = machines.begin()->second;
            }
@@ -1,6 +1,4 @@
 #include "MediaPlayCtrl.h"
-#include "WebMediaController.hpp"
-#include "IPrinterAgent.hpp"
 #include "Widgets/Button.hpp"
 #include "Widgets/CheckBox.hpp"
 #include "Widgets/Label.hpp"
@@ -9,7 +7,6 @@
 #include "DeviceManager.hpp"
 #include "DeviceCore/DevConfigUtil.h"
 #include "slic3r/Utils/NetworkAgent.hpp"
-#include "slic3r/Utils/NetworkAgentFactory.hpp"
 #include "libslic3r/Thread.hpp"
 #include "libslic3r/AppConfig.hpp"
 #include "I18N.hpp"
@@ -18,15 +15,11 @@
 #include "slic3r/Utils/BBLNetworkPlugin.hpp"


-#include <algorithm>
-
 #include <boost/lexical_cast.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/nowide/cstdio.hpp>
 #include <boost/nowide/fstream.hpp>
 #include <boost/nowide/utf8_codecvt.hpp>
-#include <slic3r/GUI/DeviceManager.hpp>
-#include <wx/mediactrl.h>
 #undef pid_t
 #include <boost/process.hpp>
 #ifdef __WIN32__
@@ -55,7 +48,6 @@ namespace GUI {
 MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl3 *media_ctrl, const wxPoint &pos, const wxSize &size)
    : wxPanel(parent, wxID_ANY, pos, size)
    , m_media_ctrl(media_ctrl)
-    , m_active_media_controller(media_ctrl)
 {
    SetLabel("MediaPlayCtrl");
    SetBackgroundColour(*wxWHITE);
@@ -102,10 +94,7 @@ MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl3 *media_ctrl, const w
    });

    m_button_play->Bind(wxEVT_COMMAND_BUTTON_CLICKED, [this](auto &e) { TogglePlay(); });
-    m_button_play->Bind(wxEVT_RIGHT_UP, [this](auto & e) {
-        if (m_active_media_controller)
-            m_active_media_controller->Play();
-    });
+    m_button_play->Bind(wxEVT_RIGHT_UP, [this](auto & e) { m_media_ctrl->Play(); });
    // Orca: live-view FAQ link binding removed (vendor URL)

    Bind(wxEVT_RIGHT_UP, [this](auto & e) {
@@ -150,12 +139,9 @@ MediaPlayCtrl::MediaPlayCtrl(wxWindow *parent, wxMediaCtrl3 *media_ctrl, const w

 MediaPlayCtrl::~MediaPlayCtrl()
 {
-    if (m_webrtc_ctrl)
-        m_webrtc_ctrl->Stop();
-    m_media_ctrl->EndExternalStream();
    {
        boost::unique_lock lock(m_mutex);
-        m_tasks.push_back({"<exit>", nullptr});
+        m_tasks.push_back("<exit>");
        m_cond.notify_all();
    }
    while (!m_thread.try_join_for(boost::chrono::milliseconds(10))) {
@@ -165,144 +151,59 @@ MediaPlayCtrl::~MediaPlayCtrl()
    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": " << this;
 }

-void MediaPlayCtrl::SetWebMediaController(IMediaController *ctrl)
-{
-    m_web_ctrl = ctrl;
-    set_active_media_controller(current_mode());
-}
-
-void MediaPlayCtrl::set_active_media_controller(CameraStreamMode mode)
-{
-    switch (mode) {
-    case CameraStreamMode::http_snapshot:
-        if (auto *web_ctrl = dynamic_cast<WebMediaController *>(m_web_ctrl))
-            web_ctrl->set_mode(mode);
-        m_active_media_controller = m_web_ctrl;
-        break;
-    case CameraStreamMode::webrtc:
-        if (!m_webrtc_ctrl) {
-            m_webrtc_ctrl = std::make_unique<WebRtcMediaController>(
-                [this](const wxImage& image, wxSize size) { m_media_ctrl->SetExternalFrame(image, size); },
-                [this, token = std::weak_ptr<int>(m_token)](WebRtcMediaController::Status status) {
-                    if (token.expired())
-                        return;
-                    CallAfter([this, status] { on_webrtc_status(status); });
-                });
-        }
-        m_active_media_controller = m_webrtc_ctrl.get();
-        break;
-    default:
-        m_active_media_controller = m_media_ctrl;
-        break;
-    }
-}
-
-CameraStreamMode MediaPlayCtrl::current_mode() const
-{
-    auto agent = wxGetApp().getAgent();
-    return agent ? agent->get_camera_stream_mode() : CameraStreamMode::none;
-}
-
 void MediaPlayCtrl::SetMachineObject(MachineObject* obj)
 {
-    const CameraStreamMode mode = current_mode();
-    if (mode != m_last_mode) {
-        if (m_last_state != MEDIASTATE_IDLE) {
-            m_failed_code = 0; // a mode switch is not a stream failure - don't arm back-off
-            Stop(" ");
+    std::string machine = obj ? obj->get_dev_id() : "";
+    if (obj) {
+        m_camera_exists  = obj->has_ipcam;
+        m_dev_ver        = obj->get_ota_version();
+        m_lan_mode       = obj->is_lan_mode_printer();
+        m_lan_proto      = obj->liveview_local;
+        m_remote_proto   = obj->get_liveview_remote();
+        m_lan_ip         = obj->get_dev_ip();
+        m_lan_passwd     = obj->get_access_code();
+        m_device_busy    = obj->is_camera_busy_off();
+        m_tutk_state     = obj->tutk_state;
+
+        if (DevPrinterConfigUtil::get_printer_series_str(obj->printer_type) == "series_o" && BBLNetworkPlugin::instance().use_legacy_network()) {
+            // Legacy plugin cannot support remote play for H2D, force using local mode
+            m_remote_proto = MachineObject::LVR_None;
        }
-        m_last_mode = mode;
-    }
-    set_active_media_controller(mode);
-
-    const bool uses_local_camera_url = mode == CameraStreamMode::http || mode == CameraStreamMode::https ||
-                                       mode == CameraStreamMode::http_snapshot || mode == CameraStreamMode::rtsp;
-    const bool uses_webrtc = mode == CameraStreamMode::webrtc;
-    const std::string machine = obj ? obj->get_dev_id() : "";
-    bool changed = false;
-
-    if (uses_local_camera_url) {
-        auto agent = wxGetApp().getAgent();
-        std::string url = agent ? agent->get_local_camera_stream_url() : "";
-        m_camera_exists = !url.empty();
-        Enable(obj && m_camera_exists);
-        changed = machine != m_machine || url != m_agent_camera_url;
-        m_agent_camera_url = url;
-        m_url = from_u8(url);
-    } else if (uses_webrtc) {
-        m_camera_exists = obj != nullptr;
-        Enable(obj != nullptr);
-        changed = machine != m_machine;
-        BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::SetMachineObject webrtc: changed=" << changed
-                                << " last_state=" << m_last_state << " web_user_stopped=" << m_web_user_stopped;
-        m_url.clear();
-        m_agent_camera_url.clear();
    } else {
-        if (obj) {
-            m_camera_exists  = obj->has_ipcam;
-            m_dev_ver        = obj->get_ota_version();
-            m_lan_mode       = obj->is_lan_mode_printer();
-            m_lan_proto      = obj->liveview_local;
-            m_remote_proto   = obj->get_liveview_remote();
-            m_lan_ip         = obj->get_dev_ip();
-            m_lan_passwd     = obj->get_access_code();
-            m_device_busy    = obj->is_camera_busy_off();
-            m_tutk_state     = obj->tutk_state;
-
-            if (DevPrinterConfigUtil::get_printer_series_str(obj->printer_type) == "series_o" && BBLNetworkPlugin::instance().use_legacy_network()) {
-                // Legacy plugin cannot support remote play for H2D, force using local mode
-                m_remote_proto = LiveviewRemote::LVR_None;
-            }
-        } else {
-            m_camera_exists = false;
-            m_lan_mode = false;
-            m_lan_proto = LiveviewLocal::LVL_None;
-            m_lan_ip.clear();
-            m_lan_passwd.clear();
-            m_dev_ver.clear();
-            m_tutk_state.clear();
-            m_remote_proto = 0;
-            m_device_busy = false;
-        }
-        Enable(obj && obj->is_info_ready() && obj->m_push_count > 0);
-        if (machine == m_machine)
-            return;
-
-        m_machine = machine;
-        BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl switch machine: " << m_machine;
-        m_disable_lan = false;
-        m_failed_retry = 0;
-        m_last_failed_codes.clear();
-        m_last_user_play = wxDateTime::Now();
-        std::string stream_url;
-        if (get_stream_url(&stream_url)) {
-            m_streaming = boost::algorithm::contains(stream_url, "device=" + m_machine);
-        } else {
-            m_streaming = false;
-        }
-        if (m_last_state != MEDIASTATE_IDLE)
-            Stop(" ");
-        if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid state conflict
-            m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
-        else
-            SetStatus("", false);
+        m_camera_exists = false;
+        m_lan_mode = false;
+        m_lan_proto = MachineObject::LVL_None;
+        m_lan_ip.clear();
+        m_lan_passwd.clear();
+        m_dev_ver.clear();
+        m_tutk_state.clear();
+        m_remote_proto = 0;
+        m_device_busy = false;
+    }
+    Enable(obj && obj->is_info_ready() && obj->m_push_count > 0);
+    if (machine == m_machine) {
+        if (m_last_state == MEDIASTATE_IDLE && IsEnabled())
+            Play();
        return;
    }
-
    m_machine = machine;
-    if (!changed)
-        return;
-
-    // A genuine target switch is not a stream failure and should clear the
-    // manual-stop state before the new target is allowed to play.
-    m_web_user_stopped = false;
-    if (uses_local_camera_url) {
-        m_failed_code = 0;
-        m_failed_retry = 0;
-        m_next_retry = wxDateTime();
+    BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl switch machine: " << m_machine;
+    m_disable_lan = false;
+    m_failed_retry = 0;
+    m_last_failed_codes.clear();
+    m_last_user_play = wxDateTime::Now();
+    std::string stream_url;
+    if (get_stream_url(&stream_url)) {
+        m_streaming = boost::algorithm::contains(stream_url, "device=" + m_machine);
+    } else {
+        m_streaming = false;
    }
    if (m_last_state != MEDIASTATE_IDLE)
        Stop(" ");
+    if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid state conflict
+        m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
+    else
+        SetStatus("", false);
 }

 wxString hide_id_middle_string(wxString const &str, size_t offset = 0, size_t length = -1)
@@ -353,71 +254,13 @@ void refresh_agora_url(char const* device, char const* dev_ver, char const* chan

 void MediaPlayCtrl::Play()
 {
-    if ((m_next_retry.IsValid() && wxDateTime::Now() < m_next_retry) || !IsShownOnScreen() || m_last_state != MEDIASTATE_IDLE)
+    if (!m_next_retry.IsValid() || wxDateTime::Now() < m_next_retry)
        return;
-
-    const CameraStreamMode mode = current_mode();
-    set_active_media_controller(mode);
-    m_last_mode = mode;
-    auto agent = wxGetApp().getAgent();
-
-    auto printer_agent = agent ? agent->get_printer_agent() : nullptr;
-    const bool is_bbl = (printer_agent ? printer_agent->get_agent_info().id : "") == BBL_PRINTER_AGENT_ID;
-
-    if (!is_bbl) {
-        const bool is_webrtc = mode == CameraStreamMode::webrtc;
-        const bool is_snapshot = mode == CameraStreamMode::http_snapshot;
-        const bool is_http_stream = mode == CameraStreamMode::http || mode == CameraStreamMode::https || mode == CameraStreamMode::rtsp;
-        if (!is_webrtc && !is_snapshot && !is_http_stream)
-            return;
-
-        auto *webrtc_ctrl = is_webrtc ? dynamic_cast<WebRtcMediaController *>(m_active_media_controller) : nullptr;
-        if (is_webrtc && (!webrtc_ctrl || !m_media_ctrl)) {
-            Stop(_L("Please confirm if the printer is connected."));
-            return;
-        }
-        if (webrtc_ctrl && webrtc_ctrl->is_active())
-            return;
-
-        m_failed_code = 0;
-        if (!m_active_media_controller || m_machine.empty() || !IsEnabled() || !m_camera_exists ||
-            (!is_webrtc && m_url.IsEmpty())) {
-            Stop(_L("Please confirm if the printer is connected."));
-            return;
-        }
-
-        if (is_webrtc) {
-            BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::Play webrtc: last_state=" << m_last_state << " failed_retry=" << m_failed_retry
-                                    << " shown=" << IsShownOnScreen();
-            auto channel = agent ? agent->create_camera_signaling_channel(m_machine, wxGetApp().get_printer_cloud_provider()) : nullptr;
-            if (!channel) {
-                Stop(_L("Sign in to OrcaCloud to view the camera."));
-                return;
-            }
-            webrtc_ctrl->set_signalling_channel(std::move(channel));
-            m_media_ctrl->BeginExternalStream();
-            m_last_state = MEDIASTATE_INITIALIZING;
-            SetStatus(_L("Initializing..."), false);
-        } else if (is_snapshot) {
-            m_last_state = wxMEDIASTATE_PLAYING;
-            SetStatus(_L("Playing..."), false);
-        }
-
-        m_button_play->SetIcon("media_stop");
-        if (m_active_media_controller == m_media_ctrl) {
-            // wxMediaCtrl3 reports when it has a decoded frame; load() waits for
-            // that event before queuing Play so the stream is not marked stopped.
-            load();
-        } else {
-            m_active_media_controller->Load(wxURI(m_url));
-            m_active_media_controller->Play();
-        }
-        if (webrtc_ctrl) {
-            m_webrtc_epoch = webrtc_ctrl->epoch();
-        }
+    if (!IsShownOnScreen())
+        return;
+    if (m_last_state != MEDIASTATE_IDLE) {
        return;
    }
-
    m_failed_code = 0;
    if (m_machine.empty()) {
        Stop(_L("Please confirm if the printer is connected."));
@@ -438,15 +281,16 @@ void MediaPlayCtrl::Play()
    }

    BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::Play: " << m_lan_proto << m_remote_proto << m_disable_lan;
+    NetworkAgent *agent = wxGetApp().getAgent();
    std::string  agent_version = agent ? agent->get_version() : "";
-    if (m_lan_proto > LiveviewLocal::LVL_Disable && (m_lan_mode || !m_remote_proto) && !m_disable_lan && !m_lan_ip.empty()) {
+    if (m_lan_proto > MachineObject::LVL_Disable && (m_lan_mode || !m_remote_proto) && !m_disable_lan && !m_lan_ip.empty()) {
        m_disable_lan = m_remote_proto && !m_lan_mode; // try remote next time
        std::string url;
-        if (m_lan_proto == LiveviewLocal::LVL_Local)
+        if (m_lan_proto == MachineObject::LVL_Local)
            url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd;
-        else if (m_lan_proto == LiveviewLocal::LVL_Rtsps)
+        else if (m_lan_proto == MachineObject::LVL_Rtsps)
            url = "bambu:///rtsps___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsps";
-        else if (m_lan_proto == LiveviewLocal::LVL_Rtsp)
+        else if (m_lan_proto == MachineObject::LVL_Rtsp)
            url = "bambu:///rtsp___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsp";
        url += "&device=" + m_machine;
        url += "&net_ver=" + agent_version;
@@ -468,8 +312,8 @@ void MediaPlayCtrl::Play()
    // !m_lan_mode && !m_remote_proto && m_lan_proto == LVL_Disable (*)
    // !m_lan_mode && !m_remote_proto && m_lan_proto == LVL_None (x)

-    if (m_lan_proto <= LiveviewLocal::LVL_Disable && (m_lan_mode || !m_remote_proto)) {
-        Stop(m_lan_proto == LiveviewLocal::LVL_None
+    if (m_lan_proto <= MachineObject::LVL_Disable && (m_lan_mode || !m_remote_proto)) {
+        Stop(m_lan_proto == MachineObject::LVL_None
            ? _L("A problem occurred. Please update the printer firmware and try again.")
            : _L("LAN Only Liveview is off. Please turn on the liveview on printer screen."));
        return;
@@ -537,78 +381,15 @@ void MediaPlayCtrl::Play()

 void start_ping_test();

-void MediaPlayCtrl::StopWebStream()
-{
-    if (m_last_state == MEDIASTATE_IDLE)
-        return;
-    if (m_active_media_controller && m_active_media_controller == m_web_ctrl)
-        m_active_media_controller->Stop();
-    m_button_play->SetIcon("media_play");
-    m_last_state = MEDIASTATE_IDLE;
-    SetStatus(_L("Video Stopped."), false);
-}
-
 void MediaPlayCtrl::Stop(wxString const &msg, wxString const &msg2)
 {
-    const bool webrtc_active = m_last_mode == CameraStreamMode::webrtc &&
-                               dynamic_cast<WebRtcMediaController *>(m_active_media_controller) != nullptr;
-    BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::Stop: last_state=" << m_last_state
-                            << " webrtc_active=" << webrtc_active << " failed_code=" << m_failed_code
-                            << " msg='" << msg.ToUTF8().data() << "'";
-    if (webrtc_active) {
-        m_active_media_controller->Stop();
-        m_media_ctrl->EndExternalStream();
-    }
-    switch (m_last_mode) {
-    case CameraStreamMode::http:
-    case CameraStreamMode::https:
-    case CameraStreamMode::http_snapshot: {
-        const bool snapshot = m_last_mode == CameraStreamMode::http_snapshot;
-        if (m_last_state != MEDIASTATE_IDLE) {
-            if (snapshot) {
-                if (m_active_media_controller)
-                    m_active_media_controller->Stop();
-            } else {
-                // http/https mode plays through the ffmpeg backend (m_media_ctrl), not
-                // the webview - tear its read thread down too, otherwise it keeps
-                // pulling and painting frames after the UI says "Video Stopped".
-                boost::unique_lock lock(m_mutex);
-                m_tasks.push_back({"<stop>", m_active_media_controller});
-                m_cond.notify_all();
-            }
-            m_button_play->SetIcon("media_play");
-            m_last_state = MEDIASTATE_IDLE;
-            if (!msg.IsEmpty())
-                SetStatus(msg);
-            else
-                SetStatus(_L("Video Stopped."), false);
-            // Keep retries bounded for an explicit or retry-driven playback attempt.
-            // m_failed_retry is cleared on success (onStateChanged) and on a deliberate
-            // machine switch (SetMachineObject); manual playback via TogglePlay resets it.
-            if (m_failed_code != 0) {
-                const bool auto_retry = wxGetApp().app_config->get("liveview", "auto_retry") != "false";
-                ++m_failed_retry;
-                m_next_retry = auto_retry
-                    ? wxDateTime::Now() + wxTimeSpan::Seconds(std::min(5 * m_failed_retry, 30))
-                    : wxDateTime::Now() + wxTimeSpan::Days(1); // "off": wait for a manual retry
-            }
-        } else if (!msg.IsEmpty()) {
-            SetStatus(msg, false);
-        }
-        return;
-    }
-    default:
-        break;
-    }
-
    int last_state = m_last_state;

    if (m_last_state != MEDIASTATE_IDLE) {
        m_media_ctrl->InvalidateBestSize();
        m_button_play->SetIcon("media_play");
        boost::unique_lock lock(m_mutex);
-        if (!webrtc_active)
-            m_tasks.push_back({"<stop>", m_active_media_controller});
+        m_tasks.push_back("<stop>");
        m_cond.notify_all();
        if (!msg.IsEmpty())
            SetStatus(msg);
@@ -673,38 +454,15 @@ void MediaPlayCtrl::Stop(wxString const &msg, wxString const &msg2)
        m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(5 * m_failed_retry);
 }

-void MediaPlayCtrl::on_webrtc_status(WebRtcMediaController::Status status)
-{
-    // Drop CallAfter-queued events from a superseded Play attempt.
-    if (status.epoch != m_webrtc_epoch)
-        return;
-    if (status.kind == WebRtcMediaController::Status::Connecting) {
-        m_last_state = MEDIASTATE_INITIALIZING;
-        SetStatus(_L("Initializing..."), false);
-    } else if (status.kind == WebRtcMediaController::Status::Playing) {
-        m_last_state = wxMEDIASTATE_PLAYING;
-        m_failed_code = 0;
-        m_failed_retry = 0;
-        SetStatus(_L("Playing..."), false);
-    } else if (status.kind == WebRtcMediaController::Status::Failed) {
-        m_failed_code = static_cast<int>(status.code) + 1;
-        Stop();
-    }
-    // Status::Stopped needs no action: a genuine failure arrives as Failed, and
-    // a stop we initiated is already handled by Stop() itself.
-}
-
 void MediaPlayCtrl::TogglePlay()
 {
    BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::TogglePlay";
    if (m_last_state != MEDIASTATE_IDLE) {
        m_next_retry = wxDateTime();
-        m_web_user_stopped = true;
        Stop();
    } else {
        m_failed_retry = 0;
        m_user_triggered = true;
-        m_web_user_stopped = false;
        if (m_last_user_play + wxTimeSpan::Minutes(5) < wxDateTime::Now()) {
            m_last_failed_codes.clear();
            m_last_user_play = wxDateTime::Now();
@@ -770,13 +528,13 @@ void MediaPlayCtrl::ToggleStream()
            wxGetApp().app_config->set("not_show_vcamera_stop_prev", "1");
        if (res == wxID_CANCEL) return;
    }
-    if (m_lan_proto > LiveviewLocal::LVL_Disable && (m_lan_mode || !m_remote_proto) && !m_disable_lan && !m_lan_ip.empty()) {
+    if (m_lan_proto > MachineObject::LVL_Disable && (m_lan_mode || !m_remote_proto) && !m_disable_lan && !m_lan_ip.empty()) {
        std::string url;
-        if (m_lan_proto == LiveviewLocal::LVL_Local)
+        if (m_lan_proto == MachineObject::LVL_Local)
            url = "bambu:///local/" + m_lan_ip + ".?port=6000&user=" + m_lan_user + "&passwd=" + m_lan_passwd;
-        else if (m_lan_proto == LiveviewLocal::LVL_Rtsps)
+        else if (m_lan_proto == MachineObject::LVL_Rtsps)
            url = "bambu:///rtsps___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsps";
-        else if (m_lan_proto == LiveviewLocal::LVL_Rtsp)
+        else if (m_lan_proto == MachineObject::LVL_Rtsp)
            url = "bambu:///rtsp___" + m_lan_user + ":" + m_lan_passwd + "@" + m_lan_ip + "/streaming/live/1?proto=rtsp";
        url += "&device=" + into_u8(m_machine);
        url += "&dev_ver=" + m_dev_ver;
@@ -836,9 +594,7 @@ void MediaPlayCtrl::jump_to_play()
 void MediaPlayCtrl::onStateChanged(wxMediaEvent &event)
 {
    auto last_state = m_last_state;
-    if (m_active_media_controller != m_media_ctrl)
-        return;
-    auto state      = m_active_media_controller->GetState();
+    auto state      = m_media_ctrl->GetState();
    BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::onStateChanged: " << state << ", last_state: " << last_state;
    if ((int) state < 0) return;
    {
@@ -850,14 +606,14 @@ void MediaPlayCtrl::onStateChanged(wxMediaEvent &event)
    }
    if ((last_state == MEDIASTATE_IDLE || last_state == MEDIASTATE_INITIALIZING) && state == wxMEDIASTATE_STOPPED) { return; }
    if ((last_state == wxMEDIASTATE_PAUSED || last_state == wxMEDIASTATE_PLAYING) && state == wxMEDIASTATE_STOPPED) {
-        m_failed_code = m_active_media_controller->GetLastError();
+        m_failed_code = m_media_ctrl->GetLastError();
        Stop();
        return;
    }
    if (last_state == MEDIASTATE_LOADING && (state == wxMEDIASTATE_STOPPED || state == wxMEDIASTATE_PAUSED)) {
-        wxSize size = m_active_media_controller->GetVideoSize();
+        wxSize size = m_media_ctrl->GetVideoSize();
        BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl::onStateChanged: size: " << size.x << "x" << size.y;
-        m_failed_code = m_active_media_controller->GetLastError();
+        m_failed_code = m_media_ctrl->GetLastError();
        if (size.GetWidth() >= 320) {
            m_last_state = state;
            m_failed_code = 0;
@@ -867,7 +623,7 @@ void MediaPlayCtrl::onStateChanged(wxMediaEvent &event)
            m_failed_retry = 0;
            m_disable_lan = false;
            boost::unique_lock lock(m_mutex);
-            m_tasks.push_back({"<play>", m_active_media_controller});
+            m_tasks.push_back("<play>");
            m_cond.notify_all();
        } else if (event.GetId()) {
            if (m_failed_code == 0)
@@ -910,8 +666,7 @@ void MediaPlayCtrl::load()
 {
    m_last_state = MEDIASTATE_LOADING;
    SetStatus(_L("Loading..."));
-    const auto mode = current_mode();
-    if (mode == CameraStreamMode::none && wxGetApp().app_config->get("internal_developer_mode") == "true") {
+    if (wxGetApp().app_config->get("internal_developer_mode") == "true") {
        std::string file_h264 = data_dir() + "/video.h264";
        std::string file_info = data_dir() + "/video.info";
        BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl dump video to " << file_h264;
@@ -922,7 +677,7 @@ void MediaPlayCtrl::load()
        m_url                = m_url + "&dump_info=" + boost::lexical_cast<std::string>(dump_info_file);
    }
    boost::unique_lock lock(m_mutex);
-    m_tasks.push_back({m_url, m_active_media_controller});
+    m_tasks.push_back(m_url);
    m_cond.notify_all();
 }

@@ -931,8 +686,9 @@ void MediaPlayCtrl::on_show_hide(wxShowEvent &evt)
    evt.Skip();
    if (m_isBeingDeleted) return;
    m_failed_retry = 0;
-    if (!IsShownOnScreen())
-        Stop();
+    if (m_next_retry.IsValid()) // Try open 2 seconds later, to avoid quick play/stop
+        m_next_retry = wxDateTime::Now() + wxTimeSpan::Seconds(2);
+    IsShownOnScreen() ? Play() : Stop();
 }

 void MediaPlayCtrl::media_proc()
@@ -942,34 +698,30 @@ void MediaPlayCtrl::media_proc()
        while (m_tasks.empty()) {
            m_cond.wait(lock);
        }
-        MediaTask task = m_tasks.front();
-        if (m_tasks.size() >= 2 && !task.command.IsEmpty() && task.command[0] != '<' &&
-            m_tasks[1].command == "<stop>" && task.controller == m_tasks[1].controller) {
-            BOOST_LOG_TRIVIAL(trace) << "MediaPlayCtrl: busy skip url: " << task.command;
+        wxString url = m_tasks.front();
+        if (m_tasks.size() >= 2 && !url.IsEmpty() && url[0] != '<' && m_tasks[1] == "<stop>") {
+            BOOST_LOG_TRIVIAL(trace) << "MediaPlayCtrl: busy skip url: " << url;
            m_tasks.pop_front();
            m_tasks.pop_front();
            continue;
        }
        lock.unlock();
-        if (task.command == "<stop>") {
+        if (url == "<stop>") {
            BOOST_LOG_TRIVIAL(info) <<  "MediaPlayCtrl: start stop";
-            if (task.controller)
-                task.controller->Stop();
+            m_media_ctrl->Stop();
            BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end stop";
        }
-        else if (task.command == "<exit>") {
+        else if (url == "<exit>") {
            break;
        }
-        else if (task.command == "<play>") {
+        else if (url == "<play>") {
            BOOST_LOG_TRIVIAL(info) <<  "MediaPlayCtrl: start play";
-            if (task.controller)
-                task.controller->Play();
+            m_media_ctrl->Play();
            BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end play";
        }
        else {
            BOOST_LOG_TRIVIAL(info) <<  "MediaPlayCtrl: start load";
-            if (task.controller)
-                task.controller->Load(wxURI(task.command));
+            m_media_ctrl->Load(wxURI(url));
            BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl: end load";
        }
        lock.lock();
@@ -9,9 +9,6 @@
 #define MediaPlayCtrl_h

 #include "wxMediaCtrl3.h"
-#include "IMediaController.hpp"
-#include "WebRtcMediaController.hpp"
-#include "slic3r/Utils/IPrinterAgent.hpp"

 #include <wx/panel.h>

@@ -39,10 +36,6 @@ public:

    void SetMachineObject(MachineObject * obj);

-    void SetWebMediaController(IMediaController *ctrl);
-
-    void StopWebStream();
-
    bool IsStreaming() const;

    void ToggleStream();
@@ -61,7 +54,6 @@ protected:
    void TogglePlay();

    void SetStatus(wxString const &msg, bool hyperlink = true);
-    void on_webrtc_status(WebRtcMediaController::Status status);

 private:
    void load();
@@ -74,9 +66,6 @@ private:

    static bool get_stream_url(std::string *url = nullptr);

-    CameraStreamMode current_mode() const;
-    void set_active_media_controller(CameraStreamMode mode);
-
 private:
    static inline const wxMediaState MEDIASTATE_IDLE = static_cast<wxMediaState>(3);
    static inline const wxMediaState MEDIASTATE_INITIALIZING = static_cast<wxMediaState>(4);
@@ -87,13 +76,6 @@ private:
    std::shared_ptr<int> m_token = std::make_shared<int>(0);

    wxMediaCtrl3 * m_media_ctrl;
-    IMediaController * m_active_media_controller = nullptr;
-    IMediaController * m_web_ctrl = nullptr;
-    std::unique_ptr<WebRtcMediaController> m_webrtc_ctrl;
-    CameraStreamMode m_last_mode = CameraStreamMode::none;
-    std::uint64_t m_webrtc_epoch = 0;
-    std::string m_agent_camera_url;
-    bool m_web_user_stopped = false;
    wxMediaState m_last_state = MEDIASTATE_IDLE;
    std::string m_machine;
    int m_lan_proto = 0;
@@ -109,11 +91,7 @@ private:
    bool m_disable_lan = false;
    wxString m_url;

-    struct MediaTask {
-        wxString command;
-        IMediaController *controller = nullptr;
-    };
-    std::deque<MediaTask> m_tasks;
+    std::deque<wxString> m_tasks;
    boost::mutex m_mutex;
    boost::condition_variable m_cond;
    boost::thread m_thread;
@@ -34,8 +34,6 @@

 #include "DeviceCore/DevManager.h"

-#include <boost/log/trivial.hpp>
-
 namespace Slic3r {
 namespace GUI {

@@ -261,7 +259,6 @@ void MonitorPanel::msw_rescale()

 void MonitorPanel::select_machine(std::string machine_sn)
 {
-    BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: MonitorPanel::select_machine queueing machine_sn=" << machine_sn;
    wxCommandEvent *event = new wxCommandEvent(wxEVT_COMMAND_CHOICE_SELECTED);
    event->SetString(machine_sn);
    wxQueueEvent(this, event);
@@ -279,20 +276,13 @@ void MonitorPanel::on_timer(wxTimerEvent& event)
 void MonitorPanel::on_select_printer(wxCommandEvent& event)
 {
    Slic3r::DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
-    const std::string requested_dev_id = event.GetString().ToStdString();
-    BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: MonitorPanel::on_select_printer requested_dev_id="
-                            << requested_dev_id << " device_manager=" << (dev ? "set" : "null");
    if (!dev) return;

    if ( dev->get_selected_machine() && (dev->get_selected_machine()->get_dev_id() != event.GetString().ToStdString()) && m_hms_panel) {
        m_hms_panel->clear_hms_tag();
    }

-    const bool selected = dev->set_selected_machine(requested_dev_id);
-    BOOST_LOG_TRIVIAL(info) << "Orca diagnostic: MonitorPanel::on_select_printer set_selected_machine result="
-                            << selected << " selected_dev_id="
-                            << (dev->get_selected_machine() ? dev->get_selected_machine()->get_dev_id() : "<null>");
-    if (!selected)
+    if (!dev->set_selected_machine(event.GetString().ToStdString()))
        return;

    set_default();
@@ -3,7 +3,6 @@

 #include "GUI_App.hpp"
 #include "MainFrame.hpp"
-#include "DeviceCore/DevConfigUtil.h"

 namespace Slic3r {
 namespace GUI {
@@ -109,12 +108,21 @@ bool DeviceItem::is_blocking_printing(MachineObject* obj_)
 {
    DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
    if (!dev) return true;
+    auto target_model = obj_->printer_type;
    std::string source_model = "";

    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
    source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);

-    return !DevPrinterConfigUtil::is_printer_model_compatible(source_model, *obj_);
+    if (source_model != target_model) {
+        std::vector<std::string> compatible_machine = obj_->get_compatible_machine();
+        vector<std::string>::iterator it = find(compatible_machine.begin(), compatible_machine.end(), source_model);
+        if (it == compatible_machine.end()) {
+            return true;
+        }
+    }
+
+    return false;
 }

 void DeviceItem::update_item(const DeviceItem* item)
@@ -159,4 +159,4 @@ private:
    void OnApplyDialog(wxCommandEvent &event);
 };

-}} // namespace Slic3r::GUI
+}} // namespace Slic3r::GUI
@@ -734,7 +734,6 @@ struct Sidebar::priv
    ScalableButton *  m_bpButton_add_filament;
    ScalableButton *  m_bpButton_del_filament;
    ScalableButton *  m_bpButton_ams_filament;
-    bool              m_ams_sync_button_show{true}; // last applied AMS sync button visibility
    ScalableButton *  m_bpButton_set_filament;
    int m_menu_filament_id = -1;

@@ -2025,14 +2024,12 @@ bool Sidebar::priv::sync_extruder_list(bool &only_external_material, bool is_man
    std::string machine_print_name = obj->get_show_printer_type();
    PresetBundle *preset_bundle = wxGetApp().preset_bundle;
    std::string target_model_id  = preset_bundle->printers.get_selected_preset().get_printer_type(preset_bundle);
-    const bool optional_printer_model = DevPrinterConfigUtil::is_optional_printer_model_id(obj->printer_type);
-    const bool optional_target_model  = DevPrinterConfigUtil::is_optional_printer_model_id(target_model_id);
-    Preset* machine_preset = optional_printer_model ? nullptr : get_printer_preset(obj);
-    if (!optional_printer_model && !optional_target_model && !machine_preset) {
+    Preset* machine_preset = get_printer_preset(obj);
+    if (!machine_preset) {
        BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << __LINE__ << "check error: machine_preset empty";
        return false;
    }
-    if (!optional_printer_model && !optional_target_model && machine_print_name != target_model_id) {
+    if (machine_print_name != target_model_id) {
        MessageDialog dlg(this->plater, _L("The currently selected machine preset is inconsistent with the connected printer type.\n"
                                            "Are you sure to continue syncing?"), _L("Sync printer information"), wxICON_WARNING | wxYES | wxNO);
        if (dlg.ShowModal() == wxID_NO) {
@@ -2224,11 +2221,6 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
        return;
    }

-    if (DevPrinterConfigUtil::is_optional_printer_model_id(obj->printer_type)) {
-        clear_all_sync_status();
-        return;
-    }
-
    bool printer_synced = false;
    // 1. update printer status
    const Preset &cur_preset = wxGetApp().preset_bundle->printers.get_edited_preset();
@@ -3450,22 +3442,6 @@ void Sidebar::remove_unused_filament_combos(const size_t current_extruder_count)
    }
 }

-void Sidebar::update_ams_sync_button()
-{
-    if (!p->m_bpButton_ams_filament || !wxGetApp().preset_bundle)
-        return;
-    // BBL printers always advertise AMS sync; other agents follow the active
-    // agent's filament sync mode, which flips to subscription only after the
-    // printer's get_capabilities reply arrives.
-    const bool show = wxGetApp().preset_bundle->use_bbl_network() ||
-                      (wxGetApp().getAgent() && wxGetApp().getAgent()->get_filament_sync_mode() != FilamentSyncMode::none);
-    if (p->m_ams_sync_button_show == show)
-        return;
-    p->m_ams_sync_button_show = show;
-    p->m_bpButton_ams_filament->Show(show);
-    p->m_bpButton_ams_filament->GetParent()->Layout();
-}
-
 void Sidebar::update_all_preset_comboboxes()
 {
    PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
@@ -3483,7 +3459,7 @@ void Sidebar::update_all_preset_comboboxes()
        //p->btn_connect_printer->Hide();
        p->m_printer_connect->Hide();
        //only show sync-ams button for BBL printer
-        update_ams_sync_button();
+        p->m_bpButton_ams_filament->Show();
        //update print button default value for bbl or third-party printer
        p_mainframe->set_print_button_to_default(MainFrame::PrintSelectType::ePrintPlate);
    } else {
@@ -3492,7 +3468,11 @@ void Sidebar::update_all_preset_comboboxes()
        p->m_printer_connect->Show(!use_printer_agents);

        // ORCA: show/hide sync-ams button based on filament sync mode
-        update_ams_sync_button();
+        auto agent = wxGetApp().getAgent();
+        if (agent && agent->get_filament_sync_mode() != FilamentSyncMode::none)
+            p->m_bpButton_ams_filament->Show();
+        else
+            p->m_bpButton_ams_filament->Hide();

        // Orca: with "Support 3MF as gcode" (use_3mf) the local export is a .gcode.3mf bundle, so when no
        // printer host/IP is configured the default action is "Export plate sliced file" (mirrors the
@@ -5841,30 +5821,11 @@ void Sidebar::load_ams_list(MachineObject* obj)
        filament_ams_list = build_filament_ams_list(obj);
    }

+    bool device_change     = false;
    const std::string& device = obj ? obj->get_dev_id() : "";
-    const bool same_device = p->ams_list_device == device;
-
-    // Keep sync metadata out of the device payload, but preserve it across a
-    // subscription refresh when the physical filament in a slot is unchanged.
-    // Otherwise the refreshed configs differ only by the missing
-    // filament_changed key, causing combo boxes to rebuild and lose their
-    // transient post-sync badges.
-    auto &previous_filament_ams_list = wxGetApp().preset_bundle->filament_ams_list;
-    for (auto &entry : filament_ams_list) {
-        auto previous = previous_filament_ams_list.find(entry.first);
-        const auto *previous_changed = previous == previous_filament_ams_list.end() ? nullptr :
-                                       dynamic_cast<const ConfigOptionBool *>(previous->second.option("filament_changed"));
-        if (!same_device || previous_changed == nullptr ||
-            previous->second.opt_string("filament_id", 0u) != entry.second.opt_string("filament_id", 0u)) {
-            continue;
-        }
-        entry.second.set_key_value("filament_changed",
-                                   new ConfigOptionBool{previous_changed->value});
-    }
-
-    bool device_change     = !same_device;
-    if (device_change) {
+    if (p->ams_list_device != device) {
        p->ams_list_device = device;
+        device_change      = true;
    }
    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": %1% items") % filament_ams_list.size();
    if (wxGetApp().preset_bundle->filament_ams_list == filament_ams_list && !device_change)
@@ -5874,27 +5835,9 @@ void Sidebar::load_ams_list(MachineObject* obj)
    wxGetApp().preset_bundle->filament_ams_list = filament_ams_list;

    for (auto c : p->combos_filament){
-        c->set_sync_badge(false);
        c->update();
-    }
-
-    if (!device_change) {
-        size_t combo_index = 0;
-        for (const auto &entry : filament_ams_list) {
-            const auto &tray = entry.second;
-            const bool has_filament = !tray.opt_string("filament_id", 0u).empty();
-            const bool is_placeholder = tray.has("filament_slot_placeholder") &&
-                                         tray.opt_bool("filament_slot_placeholder", 0u);
-            if (!has_filament && !is_placeholder) {
-                continue;
-            }
-            if (combo_index >= p->combos_filament.size()) {
-                break;
-            }
-            const auto *filament_changed = dynamic_cast<const ConfigOptionBool *>(tray.option("filament_changed"));
-            p->combos_filament[combo_index]->set_sync_badge(
-                has_filament && !is_placeholder && filament_changed != nullptr && filament_changed->value);
-            ++combo_index;
+        if (device_change) {
+            c->ShowBadge(false);//change printer,then clear badge
        }
    }

@@ -5913,7 +5856,7 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
    auto & list = wxGetApp().preset_bundle->filament_ams_list;
    if (list.empty()) {
        auto printer_name = p->plater->get_selected_printer_name_in_combox();
-        p->plater->pop_warning_and_go_to_device_page(printer_name, Plater::PrinterWarningType::AMS_UNAVAILABLE, _L("Sync printer information"));
+        p->plater->pop_warning_and_go_to_device_page(printer_name, Plater::PrinterWarningType::NOT_CONNECTED, _L("Sync printer information"));
        return;
    }
    bool exist_at_list_one_filament =false;
@@ -6068,32 +6011,18 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
        auto tip     = sync_color_only ? _L("Only filament color information has been synchronized from printer.") :
                                         _L("Filament type and color information have been synchronized, but slot information is not included.");
        c->SetToolTip(tip);
-        c->set_sync_badge(true);
+        c->ShowBadge(true);
    };
    { // badge ams filament
        clear_combos_filament_badge();
        if (sync_result.direct_sync) {
-            // A placeholder contributes a preserved project filament to the
-            // overwrite result, but it is not AMS-sourced and must not get a
-            // sync badge. Non-placeholder empty trays are omitted entirely.
-            size_t combo_index = 0;
-            for (const auto &entry : wxGetApp().preset_bundle->filament_ams_list) {
-                const auto &tray = entry.second;
-                const bool has_filament = !tray.opt_string("filament_id", 0u).empty();
-                const bool is_placeholder = tray.has("filament_slot_placeholder") &&
-                                             tray.opt_bool("filament_slot_placeholder", 0u);
-                if (!has_filament && !is_placeholder) {
-                    continue;
-                }
-                if (combo_index >= p->combos_filament.size()) {
-                    break;
-                }
-                if (is_placeholder) {
-                    p->combos_filament[combo_index]->set_sync_badge(false);
-                } else {
-                    badge_combox_filament(p->combos_filament[combo_index]);
-                }
-                ++combo_index;
+            // Orca: PresetBundle::sync_ams_list rebuilds combos_filament
+            // 1:1 from the AMS trays that produce a combo (loaded trays + placeholders; non-placeholder
+            // empty trays are skipped), so every resulting combo is AMS-sourced and gets a badge. The
+            // previous per-tray index walked the full filament_ams_list (including the skipped empties),
+            // so an empty slot before a loaded one dropped the badge for the trailing filaments.
+            for (auto &c : p->combos_filament) {
+                badge_combox_filament(c);
            }
        }
    }
@@ -6361,11 +6290,6 @@ template<typename T> void setup_dialog_position(T& info)

 void Sidebar::pop_sync_nozzle_and_ams_dialog() {
    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " begin pop_sync_nozzle_and_ams_dialog";
-    auto agent = wxGetApp().getAgent();
-    if (!agent || agent->get_filament_sync_mode() == FilamentSyncMode::none) {
-        BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << " filament synchronization is not supported; skipping dialog";
-        return;
-    }
    wxTheApp->CallAfter([this]() {
        SyncNozzleAndAmsDialog::InputInfo temp_na_info;
        wxPoint                           big_btn_pt;
@@ -6497,14 +6421,17 @@ void Sidebar::clear_combos_filament_badge()
 {
    auto &combos_filament = p->combos_filament;
    for (auto &c : combos_filament) { // clear flag
-        c->set_sync_badge(false);
+        c->ShowBadge(false);
    }
 }

 void Sidebar::udpate_combos_filament_badge() {
    auto &combos_filament = p->combos_filament;
    for (auto &c : combos_filament) {
-        c->update_badge_according_flag();
+        auto selection   = c->GetSelection();
+        auto select_flag = c->GetFlag(selection);
+        auto ok          = select_flag == (int) PresetComboBox::FilamentAMSType::FROM_AMS;
+        c->ShowBadge(ok);
    }

 }
@@ -12343,7 +12270,7 @@ void Plater::priv::on_select_preset(wxCommandEvent &evt)
            sidebar->auto_calc_flushing_volumes(idx);
        }
        auto select_flag = combo->GetFlag(selection);
-        combo->set_sync_badge(select_flag == (int)PresetComboBox::FilamentAMSType::FROM_AMS);
+        combo->ShowBadge(select_flag == (int)PresetComboBox::FilamentAMSType::FROM_AMS);
        q->on_filament_change(idx);
    }
    bool select_preset = !combo->selection_is_changed_according_to_physical_printers();
@@ -20930,8 +20857,6 @@ void Plater::pop_warning_and_go_to_device_page(wxString printer_name, PrinterWar
        content = _L("There are no filaments on the printer. Please load the filaments on the printer first.");
    } else if (type == PrinterWarningType::EMPTY_FILAMENT) {
        content = _L("The filaments on the printer are all unknown types. Please go to the printer screen or software device page to set the filament type.");
-    } else if (type == PrinterWarningType::AMS_UNAVAILABLE) {
-        content = _L("No AMS filament data is available for this printer. Make sure the printer's material system is detected and connected, then try again.");
    }
    MessageDialog dlg(this, content, title, wxOK | wxFORWARD | wxICON_WARNING, _L("Device Page"));
    auto          result = dlg.ShowModal();
@@ -20951,14 +20876,9 @@ bool Plater::is_same_printer_for_connected_and_selected(bool popup_warning)
    }
    if (!check_printer_initialized(obj, true, popup_warning))
        return false;
-    const std::string machine_model = obj->printer_type;
-    PresetBundle *preset_bundle = wxGetApp().preset_bundle;
-    const std::string selected_model = preset_bundle ? preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle) : std::string();
-    if (!DevPrinterConfigUtil::is_optional_printer_model_id(machine_model) &&
-        !DevPrinterConfigUtil::is_optional_printer_model_id(selected_model) &&
-        !get_printer_preset(obj)) {
+    Preset *      machine_preset     = get_printer_preset(obj);
+    if (!machine_preset)
        return false;
-    }

    if (wxGetApp().is_blocking_printing()) {
        if (popup_warning) {
@@ -22244,14 +22164,10 @@ void Plater::update_machine_sync_status()
    DeviceManager *dev_maneger = wxGetApp().getDeviceManager();
    if (!dev_maneger) {
        GUI::wxGetApp().sidebar().update_sync_status(nullptr);
-        GUI::wxGetApp().sidebar().update_ams_sync_button();
        return;
    }
    MachineObject *obj = wxGetApp().getDeviceManager()->get_selected_machine();
    GUI::wxGetApp().sidebar().update_sync_status(obj);
-    // The agent's sync mode flips once the printer's get_capabilities reply
-    // arrives; re-evaluate the filament-sync button on every device update.
-    GUI::wxGetApp().sidebar().update_ams_sync_button();
 }

 bool Plater::get_machine_sync_status()
@@ -169,8 +169,6 @@ public:
    void init_filament_combo(PlaterPresetComboBox **combo, const int filament_idx);
    void remove_unused_filament_combos(const size_t current_extruder_count);
    void update_all_preset_comboboxes();
-    // Show/hide the AMS filament-sync button from the active agent's sync mode.
-    void update_ams_sync_button();
    //void update_partplate(PartPlateList& list);
    void update_presets(Slic3r::Preset::Type preset_type);
    //BBS
@@ -637,8 +635,7 @@ public:
        NOT_CONNECTED,
        INCONSISTENT,
        UNINSTALL_FILAMENT,
-        EMPTY_FILAMENT,
-        AMS_UNAVAILABLE
+        EMPTY_FILAMENT
    };
    void pop_warning_and_go_to_device_page(wxString printer_name, PrinterWarningType type, const wxString &title);
    bool check_printer_initialized(MachineObject *obj, bool only_warning = false,bool popup_warning = true);
@@ -11,7 +11,6 @@ namespace Slic3r
            // IMPORTANT: ordinal order is the Plugins dialog Status sort priority.
            Activated,
            Error,
-            RuntimeError,
            Inactive,
            Loading
        };
@@ -22,28 +21,11 @@ namespace Slic3r
            {
            case PluginStatus::Activated: return "Activated";
            case PluginStatus::Error: return "Error";
-            case PluginStatus::RuntimeError: return "RuntimeError";
            case PluginStatus::Inactive: return "Inactive";
            case PluginStatus::Loading: return "Loading";
            }

            return "Inactive";
        }
-
-        // why: a plugin whose module is live but whose catalog carries an error is a
-        //   RUNTIME fault (e.g. a capability rejected at register time) - it stays
-        //   loaded/checked and is only flagged, distinct from a load-time Error where
-        //   the module never came up. Loading wins over both so an in-flight reload
-        //   never flashes an error.
-        inline PluginStatus resolve_plugin_status(bool loading, bool has_error, bool is_loaded)
-        {
-            if (loading)
-                return PluginStatus::Loading;
-            if (has_error)
-                return is_loaded ? PluginStatus::RuntimeError : PluginStatus::Error;
-            if (is_loaded)
-                return PluginStatus::Activated;
-            return PluginStatus::Inactive;
-        }
    }
 } // namespace Slic3r::GUI
@@ -8,6 +8,7 @@
 #include <boost/filesystem.hpp>

 #include <wx/event.h>
+#include <wx/uri.h>

 #include <utility>

@@ -55,6 +56,14 @@ wxString web_base_url()
    return wxString("file://") + from_u8(dir) + "/";
 }

+// Whether a loaded document is the plugin HTML's own base URL. The web view reports the URL it
+// parsed, so any fragment the page navigated to is ignored and the escaping it applies to what the
+// resources path holds (a space, a non-ASCII character) is undone first.
+bool is_content_url(const wxString& url)
+{
+    return wxURI::Unescape(url.BeforeFirst('#')) == web_base_url();
+}
+
 } // namespace

 PluginWebDialog::PluginWebDialog(wxWindow*          parent,
@@ -89,6 +98,7 @@ PluginWebDialog::PluginWebDialog(wxWindow*          parent,
        // missing/blocked bootstrap resource (e.g. a packaged build) still triggers it.
        Bind(wxEVT_WEBVIEW_LOADED, &PluginWebDialog::on_bootstrap_event, this, wv->GetId());
        Bind(wxEVT_WEBVIEW_ERROR, &PluginWebDialog::on_bootstrap_event, this, wv->GetId());
+        Bind(wxEVT_WEBVIEW_NAVIGATED, &PluginWebDialog::on_navigated, this, wv->GetId());
    }
    Bind(wxEVT_CLOSE_WINDOW, &PluginWebDialog::on_close_window, this);
 }
@@ -139,19 +149,37 @@ void PluginWebDialog::destroy_for_plugin(PluginWebDialog* dialog)

 void PluginWebDialog::on_bootstrap_event(wxWebViewEvent& event)
 {
-    // The first bootstrap load (or its error) triggers the swap to plugin HTML;
-    // the resulting plugin-page load is ignored (guarded by m_content_loaded).
-    load_plugin_content();
+    const bool loaded = event.GetEventType() == wxEVT_WEBVIEW_LOADED;
+    // The first bootstrap load (or its error) triggers the swap to plugin HTML.
+    if (!m_content_loaded)
+        load_plugin_content();
+    // WebKit reloads the SetPage base URL, so a committed load of it that we did not start is a reload.
+    // A failed navigation is reported against the page that stayed but never commits. Edge ignores the
+    // base URL and restores SetPage content itself, so nothing matches there.
+    else if (is_content_url(event.GetURL())) {
+        if (m_own_page_load)
+            m_own_page_load = false;
+        else if (loaded && m_content_navigated)
+            load_plugin_content();
+    }
+    if (loaded)
+        m_content_navigated = false;
+    event.Skip();
+}
+
+void PluginWebDialog::on_navigated(wxWebViewEvent& event)
+{
+    m_content_navigated = is_content_url(event.GetURL());
    event.Skip();
 }

 void PluginWebDialog::load_plugin_content()
 {
-    if (m_content_loaded)
-        return;
    m_content_loaded = true;
-    if (wxWebView* wv = browser())
+    if (wxWebView* wv = browser()) {
+        m_own_page_load = true;
        wv->SetPage(wxString::FromUTF8(m_html), web_base_url());
+    }
 }

 void PluginWebDialog::on_script_message(const nlohmann::json& payload)
@@ -64,6 +64,7 @@ protected:

 private:
    void on_bootstrap_event(wxWebViewEvent& event);
+    void on_navigated(wxWebViewEvent& event);
    void load_plugin_content();
    void on_close_window(wxCloseEvent& event);
    void fire_submit(const nlohmann::json& data);
@@ -72,6 +73,8 @@ private:

    std::string                   m_html;
    bool                          m_content_loaded{false};
+    bool                          m_own_page_load{false};   // a SetPage of the plugin HTML is in flight
+    bool                          m_content_navigated{false}; // a navigation to the base URL has committed
    bool                          m_open{true};
    bool                          m_close_fired{false};
    std::optional<nlohmann::json> m_result;
@@ -193,7 +193,6 @@ nlohmann::json build_plugin_payload_item(const PluginDialogItem& dialog_item)
    payload_item["label"]                 = dialog_item.display_name;
    payload_item["source"]                = to_string(dialog_item.source);
    payload_item["status"]                = to_string(dialog_item.status);
-    payload_item["is_loaded"]             = dialog_item.is_loaded;
    payload_item["error"]                 = dialog_item.error_text;
    payload_item["update_status"]         = to_string(dialog_item.update_status);
    payload_item["unauthorized"]          = dialog_item.unauthorized;
@@ -338,7 +337,14 @@ PluginDialogItem build_plugin_dialog_item(const PluginDescriptor& descriptor)
    item.sharing_token = descriptor.sharing_token;
    item.thumbnail_url = descriptor.thumbnail_url;

-    item.status = resolve_plugin_status(item.loading, item.has_error, item.is_loaded);
+    if (item.loading)
+        item.status = PluginStatus::Loading;
+    else if (item.has_error)
+        item.status = PluginStatus::Error;
+    else if (item.is_loaded)
+        item.status = PluginStatus::Activated;
+    else
+        item.status = PluginStatus::Inactive;

    item.available_actions        = evaluate_action_policy(item);
    const bool has_enabled_script = std::any_of(item.capabilities.begin(), item.capabilities.end(),
@@ -784,9 +790,6 @@ void PluginsDialog::toggle_plugin(const std::string& plugin_key, bool enabled)
        }

        BOOST_LOG_TRIVIAL(info) << "Plugin unloaded from Plugins dialog: " << plugin_key;
-        // A user-disabled plugin has no meaningful error state.
-        if (!manager.clear_plugin_error(plugin_key))
-            BOOST_LOG_TRIVIAL(warning) << "Failed to clear plugin error for " << plugin_key << " (failed to find)";
        // A prior activation of this plugin is moot now; drop it so no stale "Activated" arrives later.
        if (m_activating_plugin_key == plugin_key)
            m_activating_plugin_key.clear();
@@ -63,7 +63,6 @@ std::string PrePrintChecker::get_print_status_info(PrintDialogStatus status)
    case PrintStatusRackReading: return "PrintStatusRackReading";
    case PrintStatusRackNozzleNumUnmeetWarning: return "PrintStatusRackNozzleNumUnmeetWarning";
    case PrintStatusHasUnreliableNozzleWarning: return "PrintStatusHasUnreliableNozzleWarning";
-    case PrintStatusOptionalPrinterModel: return "PrintStatusOptionalPrinterModel";
    case PrintStatusWarningExtFilamentNotMatch: return "PrintStatusWarningExtFilamentNotMatch";
    case PrintStatusFilamentWarningNozzleHRC: return "PrintStatusFilamentWarningNozzleHRC";
    case PrintStatusTPUUnsupportCaliOn: return "PrintStatusTPUUnsupportCaliOn";
@@ -105,7 +104,6 @@ wxString PrePrintChecker::get_pre_state_msg(PrintDialogStatus status)
    case PrintStatusNeedConsistencyUpgrading: return _L("Cannot send the print job to a printer whose firmware must be updated.");
    case PrintStatusBlankPlate: return _L("Cannot send a print job for an empty plate.");
    case PrintStatusTimelapseNoSdcard: return _L("Storage needs to be inserted to record timelapse.");
-    case PrintStatusOptionalPrinterModel: return _L("The selected printer model could not be identified, so compatibility with the print file configuration cannot be verified. Please verify the printer preset before sending.");
    case PrintStatusMixAmsAndVtSlotWarning: return _L("You have selected both external and AMS filaments for an extruder. You will need to manually switch the external filament during printing.");
    case PrintStatusTPUUnsupportAutoCali: return _L("TPU 90A/TPU 85A is too soft and does not support automatic Flow Dynamics calibration.");
    case PrintStatusWarningKvalueNotUsed: return _L("Set dynamic flow calibration to 'OFF' to enable custom dynamic flow value.");
@@ -381,3 +379,4 @@ bool PrinterMsgPanel::UpdateInfos(const std::vector<prePrintInfo>& infos)
 }
 };

+
@@ -112,7 +112,6 @@ enum PrintDialogStatus : unsigned int {
    // Orca: a nozzle diameter that differs from the one the printer remembers is a warning,
    // not an error, so non-standard nozzles can still be printed with.
    PrintStatusNozzleDiameterMismatch,
-    PrintStatusOptionalPrinterModel,
    PrintStatusPrinterWarningEnd,

    // Warnings for filament
@@ -361,8 +361,7 @@ wxString PresetComboBox::get_preset_item_name(unsigned int index)
                return GetString(index);
            }

-            std::map<std::string, MachineObject *> machine_list =
-                dev->get_my_machine_list(dev->get_current_printer_agent_id());
+            std::map<std::string, MachineObject *> machine_list = dev->get_my_machine_list();
            if (machine_list.empty()) {
                assert(false);
                m_selected_dev_id.clear();
@@ -480,8 +479,7 @@ void PresetComboBox::add_connected_printers(std::string selected, bool alias_nam
    if (!dev)
        return;

-    std::map<std::string, MachineObject *> machine_list =
-        dev->get_my_machine_list(dev->get_current_printer_agent_id());
+    std::map<std::string, MachineObject *> machine_list = dev->get_my_machine_list();
    if (machine_list.empty())
        return;

@@ -1001,13 +999,7 @@ void PlaterPresetComboBox::update_badge_according_flag() {
    auto selection   = GetSelection();
    auto select_flag = GetFlag(selection);
    auto ok          = select_flag == (int) PresetComboBox::FilamentAMSType::FROM_AMS;
-    ShowBadge(m_sync_badge || ok);
-}
-
-void PlaterPresetComboBox::set_sync_badge(bool show)
-{
-    m_sync_badge = show;
-    ShowBadge(show);
+    ShowBadge(ok);
 }

 bool PlaterPresetComboBox::switch_to_tab()
@@ -205,7 +205,6 @@ public:
    void msw_rescale() override;
    void OnSelect(wxCommandEvent& evt) override;
    void update_badge_according_flag();
-    void set_sync_badge(bool show);

    FilamentColor get_cur_color_info();
    void show_default_color_picker();
@@ -215,7 +214,6 @@ public:
 private:
    // BBS
    wxColor m_color;
-    bool    m_sync_badge{false};
 };


@@ -1736,8 +1736,7 @@ void InputIpAddressDialog::set_machine_obj(MachineObject* obj)
    auto str_ip = m_input_ip->GetTextCtrl()->GetValue();
    auto str_access_code = m_input_access_code->GetTextCtrl()->GetValue();
    // ORCA enabling / disabling buttons with conditions enough to change its style
-    m_button_ok->Enable(isIp(str_ip.ToStdString()) &&
-                        (str_access_code.IsEmpty() || str_access_code.Length() >= 8));
+    m_button_ok->Enable(isIp(str_ip.ToStdString()) && str_access_code.Length() == 8);

    Layout();
    Fit();
@@ -1802,8 +1801,6 @@ void InputIpAddressDialog::on_ok(wxMouseEvent& evt)
    m_trouble_shoot->Hide();
    std::string str_ip = m_input_ip->GetTextCtrl()->GetValue().ToStdString();
    std::string str_access_code = m_input_access_code->GetTextCtrl()->GetValue().ToStdString();
-    if (str_access_code.empty())
-        str_access_code = "88888888";
    std::string str_name = m_input_printer_name->GetTextCtrl()->GetValue().Strip(wxString::both).ToStdString();
    // Serial number should not contain lower case letters, and bambu_network plugin crashes
    // if user entered the wrong serial number, so we call `Upper()` here.
@@ -1838,8 +1835,6 @@ void InputIpAddressDialog::on_send_retry()
    Fit();
    wxString ip              = m_input_ip->GetTextCtrl()->GetValue();
    wxString str_access_code = m_input_access_code->GetTextCtrl()->GetValue();
-    if (str_access_code.IsEmpty())
-        str_access_code = "88888888";

    // check support function
    if (!m_obj) return;
@@ -2061,7 +2056,7 @@ void InputIpAddressDialog::on_text(wxCommandEvent &evt)
    auto str_ip              = m_input_ip->GetTextCtrl()->GetValue();
    auto str_access_code     = m_input_access_code->GetTextCtrl()->GetValue();

-    if (str_access_code.IsEmpty()) {
+    if (str_access_code.empty()) {
        str_access_code = "88888888";
    }

@@ -2077,8 +2072,7 @@ void InputIpAddressDialog::on_text(wxCommandEvent &evt)
    }

    // ORCA enabling / disabling buttons with conditions enough to change its style
-    bool valid_access_code_length = str_access_code.IsEmpty() || str_access_code.Length() >= 8;
-    bool enable_btns = isIp(str_ip.ToStdString()) && valid_access_code_length && invalid_access_code;
+    bool enable_btns = isIp(str_ip.ToStdString()) && str_access_code.Length() == 8 && invalid_access_code;
    m_button_manual_setup->Enable(enable_btns);
    m_button_ok->Enable(enable_btns);

@@ -21,7 +21,6 @@
 #include "Jobs/PlaterWorker.hpp"

 #include "DeviceCore/DevConfig.h"
-#include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevNozzleSystem.h"
 #include "DeviceCore/DevNozzleRack.h"
 #include "DeviceCore/DevExtensionTool.h"
@@ -1126,10 +1125,7 @@ bool SelectMachineDialog::do_ams_mapping(MachineObject *obj_,bool use_ams)

    int filament_result = 0;
    std::vector<bool> map_opt;  //four values: use_left_ams, use_right_ams, use_left_ext, use_right_ext
-    // Orca: only do the per-physical-extruder left/right split when the device actually reports
-    // 2+ extruders. A non-BBL multi-nozzle printer (e.g. Snapmaker U1) reports a single extruder
-    // with one filament pool, so it maps as a single surface via the else branch below.
-    if (nozzle_nums > 1 && obj_->GetExtderSystem()->GetTotalExtderCount() > 1){
+    if (nozzle_nums > 1){
        //get nozzle property, the extders are same?
        if (true/*!can_hybrid_mapping(obj_get_extder_data())*/){
            std::vector<FilamentInfo>           m_ams_mapping_result_left, m_ams_mapping_result_right;
@@ -2316,10 +2312,8 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt
    } else if (status == PrintDialogStatus::PrintStatusNoSdcard) {
        Enable_Refresh_Button(true);
        Enable_Send_Button(false);
-    }else if (status == PrintDialogStatus::PrintStatusUnsupportedPrinter ||
-              status == PrintDialogStatus::PrintStatusOptionalPrinterModel) {
+    }else if (status == PrintDialogStatus::PrintStatusUnsupportedPrinter) {
        wxString msg_text;
-        const bool block_send = status == PrintDialogStatus::PrintStatusUnsupportedPrinter;
        try
        {
            DeviceManager* dev = Slic3r::GUI::wxGetApp().getDeviceManager();
@@ -2345,21 +2339,17 @@ void SelectMachineDialog::show_status(PrintDialogStatus status, std::vector<wxSt

            auto target_print_name = wxString(DevPrinterConfigUtil::get_printer_display_name(target_model_id));
            target_print_name.Replace(wxT("Bambu Lab "), wxEmptyString);
-            if (block_send) {
-                msg_text = wxString::Format(_L("The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page."), sourcet_print_name, target_print_name);
-            } else {
-                msg_text = wxString::Format(_L("The selected printer (%s) has an unknown model, so compatibility with the print file configuration (%s) cannot be verified. Please verify the printer preset before sending."), sourcet_print_name, target_print_name);
-            }
+            msg_text = wxString::Format(_L("The selected printer (%s) is incompatible with the print file configuration (%s). Please adjust the printer preset in the prepare page or choose a compatible printer on this page."), sourcet_print_name, target_print_name);


            msg = msg_text;
            Enable_Refresh_Button(true);
-            Enable_Send_Button(!block_send);
+            Enable_Send_Button(false);
        }
        catch (...)
        {
            Enable_Refresh_Button(true);
-            Enable_Send_Button(!block_send);
+            Enable_Send_Button(false);
        }


@@ -2536,7 +2526,15 @@ bool SelectMachineDialog::is_blocking_printing(MachineObject* obj_)
        }
    }

-    return !DevPrinterConfigUtil::is_printer_model_compatible(source_model, *obj_);
+    if (source_model != target_model) {
+        std::vector<std::string> compatible_machine = obj_->get_compatible_machine();
+        vector<std::string>::iterator it = find(compatible_machine.begin(), compatible_machine.end(), source_model);
+        if (it == compatible_machine.end()) {
+            return true;
+        }
+    }
+
+    return false;
 }

 static std::unordered_set<int> _get_used_nozzle_idxes()
@@ -2624,10 +2622,6 @@ bool SelectMachineDialog::is_same_printer_model()
    if(preset_bundle == nullptr) return result;
    const auto source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);
    const auto target_model = obj_->printer_type;
-    if (DevPrinterConfigUtil::is_optional_printer_model_id(source_model) ||
-        DevPrinterConfigUtil::is_optional_printer_model_id(target_model)) {
-        return true;
-    }
    // Orca: ignore P1P -> P1S
    if (source_model != target_model) {
        if ((source_model == "C12" && target_model == "C11") || (source_model == "C11" && target_model == "C12") ||
@@ -3702,32 +3696,10 @@ void SelectMachineDialog::on_send_print()
    m_print_job->on_success([this]() { finish_mode(); });

    m_print_job->on_check_ip_address_fail([this]() {
-        // Invoked from the PrintJob worker thread when the LAN pre-flight (file upload
-        // verification) fails. Marshal device/UI access to the main thread.
-        CallAfter([this]()
-        {
-            // Reset the dialog out of sending mode so the user can retry.
-            wxCommandEvent* evt = new wxCommandEvent(EVT_CLEAR_IPADDRESS);
-            wxQueueEvent(this, evt);
-
-            DeviceManager* dev = wxGetApp().getDeviceManager();
-            MachineObject* obj = dev ? dev->get_selected_machine() : nullptr;
-
-            if (obj && obj->is_connected())
-            {
-                // Connected: failed on file upload
-                MessageDialog dlg(this,
-                                  _L("Failed to upload the file to the printer's storage. Please try again."),
-                                  _L("Send Failed"), wxOK | wxICON_ERROR);
-                dlg.ShowModal();
-            }
-            else
-            {
-                // Not connected: reenter ip and access code
-                wxGetApp().show_ip_address_enter_dialog();
-            }
-        });
-    });
+        wxCommandEvent* evt = new wxCommandEvent(EVT_CLEAR_IPADDRESS);
+        wxQueueEvent(this, evt);
+        wxGetApp().show_ip_address_enter_dialog();
+     });

    // update ota version
    NetworkAgent* agent = wxGetApp().getAgent();
@@ -4561,13 +4533,11 @@ bool SelectMachineDialog::CheckErrorExtruderNozzleWithSlicing(MachineObject* obj

            // check nozzle data valid
            {
-                // Commented out the following as ntUndefine and 0.0f are default values
-                // (signifying that the value is not given) that should PASS, not fail
-                // if (installed_ext_nozzle.GetNozzleType() == NozzleType::ntUndefine ||
-                //     installed_ext_nozzle.GetNozzleDiameter() <= 0.0f) {
-                //     show_status(PrintDialogStatus::PrintStatusNozzleDataInvalid);
-                //     return false;
-                // }
+                if (installed_ext_nozzle.GetNozzleType() == NozzleType::ntUndefine ||
+                    installed_ext_nozzle.GetNozzleDiameter() <= 0.0f) {
+                    show_status(PrintDialogStatus::PrintStatusNozzleDataInvalid);
+                    return false;
+                }

                if (obj_->is_nozzle_flow_type_supported() &&
                    installed_ext_nozzle.GetNozzleFlowType() == NozzleFlowType::NONE_FLOWTYPE) {
@@ -4596,10 +4566,7 @@ bool SelectMachineDialog::CheckErrorExtruderNozzleWithSlicing(MachineObject* obj

            // check nozzle diameter
            {
-                // 0.0f is default when there is no nozzle diameter is given.
-                // In nozzle_diameter == 0.0f case, it passes and does not require a comparison
-                if (installed_ext_nozzle.GetNozzleDiameter() > 0.0f &&
-                    slicing_ext.nozzle_diameter != installed_ext_nozzle.GetNozzleDiameter()) {
+                if (slicing_ext.nozzle_diameter != installed_ext_nozzle.GetNozzleDiameter()) {
                    std::vector<wxString> msg_params;
                    if (ext_sys->GetTotalExtderCount() == 2) {
                        const wxString& mismatch_nozzle_str = _get_nozzle_name(ext_sys->GetTotalExtderCount(), slicing_ext_idx);
@@ -4793,22 +4760,6 @@ void SelectMachineDialog::update_show_status(MachineObject* obj_)
        return;
    }

-    bool has_optional_printer_model = DevPrinterConfigUtil::is_optional_printer_model_id(obj_->printer_type);
-    if (m_print_type == PrintFromType::FROM_NORMAL) {
-        PresetBundle* preset_bundle = wxGetApp().preset_bundle;
-        has_optional_printer_model = has_optional_printer_model ||
-            (preset_bundle && DevPrinterConfigUtil::is_optional_printer_model_id(
-                preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle)));
-    } else if (m_print_type == PrintFromType::FROM_SDCARD_VIEW && !m_required_data_plate_data_list.empty()) {
-        has_optional_printer_model = has_optional_printer_model ||
-            DevPrinterConfigUtil::is_optional_printer_model_id(
-                m_required_data_plate_data_list[m_print_plate_idx]->printer_model_id);
-    }
-
-    if (has_optional_printer_model) {
-        show_status(PrintDialogStatus::PrintStatusOptionalPrinterModel);
-    }
-
    if (is_blocking_printing(obj_)) {
        show_status(PrintDialogStatus::PrintStatusUnsupportedPrinter);
        return;
@@ -5531,8 +5482,8 @@ void SelectMachineDialog::reset_and_sync_ams_list()
                item = new MaterialItem(m_filament_left_panel, colour_rgb, _L(display_materials[extruder]));
                m_sizer_ams_mapping_left->Add(item, 0, wxALL, FromDIP(5));
            }
-            else // map == 2, or (non-BBL multi-nozzle) 3+; update_material_item_pos() collapses
-            {    // these into the single panel when the device reports < 2 extruders.
+            else if (m_filaments_map[extruder] == 2)
+            {
                item = new MaterialItem(m_filament_right_panel, colour_rgb, _L(display_materials[extruder]));
                m_sizer_ams_mapping_right->Add(item, 0, wxALL, FromDIP(5));
            }
@@ -24,7 +24,6 @@
 #include "BitmapCache.hpp"

 #include "DeviceCore/DevManager.h"
-#include "DeviceCore/DevConfigUtil.h"
 #include "DeviceCore/DevStorage.h"
 #include "slic3r/Utils/FileTransferUtils.hpp"

@@ -301,7 +300,7 @@ SendToPrinterDialog::SendToPrinterDialog(Plater *plater)
    m_storage_panel->Layout();

    // try to connect
-    m_statictext_printer_msg = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(FromDIP(400), -1), wxALIGN_CENTER_HORIZONTAL);
+    m_statictext_printer_msg = new wxStaticText(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL);
    m_statictext_printer_msg->SetFont(::Label::Body_13);
    m_statictext_printer_msg->SetForegroundColour(*wxBLACK);
    m_statictext_printer_msg->Hide();
@@ -761,25 +760,9 @@ void SendToPrinterDialog::update_priner_status_msg(wxString msg, bool is_warning
        if (str_new != str_old) {
            if (m_statictext_printer_msg->GetLabel() != msg) {
                m_statictext_printer_msg->SetLabel(msg);
-                const int wrap_width = FromDIP(400);
-                m_statictext_printer_msg->Wrap(wrap_width);
-                int line_count = 1;
-                const wxString wrapped_label = m_statictext_printer_msg->GetLabel();
-                for (size_t i = 0; i < wrapped_label.length(); ++i) {
-                    if (wrapped_label[i] == '\n')
-                        ++line_count;
-                }
-                wxCoord text_width = 0;
-                wxCoord text_height = 0;
-                m_statictext_printer_msg->GetTextExtent(msg, &text_width, &text_height);
-                const int extent_line_count = text_width > 0 ?
-                    std::max(1, (static_cast<int>(text_width) + wrap_width - 1) / wrap_width) : 1;
-                line_count = std::max(line_count, extent_line_count);
-                const int line_height = std::max(m_statictext_printer_msg->GetCharHeight(), static_cast<int>(text_height));
-                const int min_height = std::max(m_statictext_printer_msg->GetBestSize().GetHeight(),
-                                                line_count * line_height + FromDIP(2));
-                m_statictext_printer_msg->SetMinSize(wxSize(wrap_width, min_height));
-                m_statictext_printer_msg->SetMaxSize(wxDefaultSize);
+                m_statictext_printer_msg->SetMinSize(wxSize(FromDIP(400), -1));
+                m_statictext_printer_msg->SetMaxSize(wxSize(FromDIP(400), -1));
+                m_statictext_printer_msg->Wrap(FromDIP(400));
                m_statictext_printer_msg->Show();
                Layout();
                Fit();
@@ -1119,7 +1102,7 @@ void SendToPrinterDialog::update_user_printer()
    wxArrayString                         machine_list_name;
    std::map<std::string, MachineObject*> option_list;

-    option_list = dev->get_my_machine_list(dev->get_current_printer_agent_id());
+    option_list = dev->get_my_machine_list();

    // same machine only appear once
    for (auto it = option_list.begin(); it != option_list.end(); it++) {
@@ -1349,7 +1332,17 @@ bool SendToPrinterDialog::is_blocking_printing(MachineObject* obj_)

    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
    auto source_model = preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle);
-    return !DevPrinterConfigUtil::is_printer_model_compatible(source_model, *obj_);
+    auto target_model = obj_->printer_type;
+
+    if (source_model != target_model) {
+        std::vector<std::string> compatible_machine = obj_->get_compatible_machine();
+        vector<std::string>::iterator it = find(compatible_machine.begin(), compatible_machine.end(), source_model);
+        if (it == compatible_machine.end()) {
+            return true;
+        }
+    }
+
+    return false;
 }

 void SendToPrinterDialog::Enable_Refresh_Button(bool en)
@@ -1493,9 +1486,6 @@ void SendToPrinterDialog::show_status(PrintDialogStatus status, std::vector<wxSt
        Enable_Send_Button(false);
        Enable_Refresh_Button(true);
    } else if (status == PrintDialogStatus::PrintStatusPublicInitFailed) {
-        wxString msg_text = _L(
-            "Failed to initialize the printer file transfer. Please check the connection and try again.");
-        update_print_status_msg(msg_text, true, true);
        Enable_Send_Button(false);
        Enable_Refresh_Button(true);
    } else if (status == PrintDialogStatus::PrintStatusPublicUploadFiled) {
@@ -1673,18 +1663,30 @@ extern void     refresh_agora_url(char const *device, char const *dev_ver, char
 void SendToPrinterDialog::GetConnection()
 {
    DeviceManager *dm  = GUI::wxGetApp().getDeviceManager();
-    MachineObject *obj = dm ? dm->get_selected_machine() : nullptr;

-    if (!obj)
+    MachineObject *obj = dm->get_selected_machine();
+    if (obj == nullptr) {
        BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " : obj is empty";
-    if (obj && !obj->get_file_remote())
+        m_connection_status = ConnectionStatus::NOT_START;
+    }
+
+    int remote_proto = obj->get_file_remote();
+    if (!remote_proto) {
        BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " : remote_proto is not support";
-    if (obj && obj->is_camera_busy_off())
-    BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " : camera is busy";
+        m_connection_status = ConnectionStatus::NOT_START;
+    }

-    NetworkAgent* agent = wxGetApp().getAgent();
+    if (obj->is_camera_busy_off()) {
+        BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << " : camera is busy";
+        m_connection_status = ConnectionStatus::NOT_START;
+    }

-    if (m_url_timer && m_url_timer->IsRunning())
+    NetworkAgent *agent         = wxGetApp().getAgent();
+    std::string   agent_version = agent ? agent->get_version() : "";
+    std::string   dev_ver       = obj->get_ota_version();
+    std::string   dev_id        = obj->get_dev_id();
+
+     if (m_url_timer && m_url_timer->IsRunning())
     {
         m_url_timer->Stop();
     }
@@ -1707,40 +1709,19 @@ void SendToPrinterDialog::GetConnection()
         m_url_timer->GetId());
     m_url_timer->StartOnce(8000);

-    if (obj && agent)
-    {
-        std::string dev_ver = obj->get_ota_version();
-        std::string dev_id = obj->get_dev_id();
-
+    if (agent) {
        if (m_tcp_try_connect) {
            std::string devIP      = obj->get_dev_ip();
            std::string accessCode = obj->get_access_code();
            std::string url        = "bambu:///local/" + devIP + "?port=6000&user=" + "bblp" + "&passwd=" + accessCode;
-            BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": Connect method tcp, dev_id=" << dev_id
-                                    << ", dev_ip=" << devIP << ", access_code_len=" << accessCode.size();
-
-            try
-            {
-                m_filetransfer_tunnel = std::make_unique<FileTransferTunnel>(module(), url);
-                m_filetransfer_tunnel->on_connection([this](bool is_success, int err_code, std::string error_msg)
-                {
-                    CallAfter([this, is_success, err_code, error_msg]()
-                    {
-                        OnConnection(is_success, err_code, error_msg);
-                    });
+            BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": Connect method tcp";
+            m_filetransfer_tunnel  = std::make_unique<FileTransferTunnel>(module(), url);
+            m_filetransfer_tunnel->on_connection([this](bool is_success, int err_code, std::string error_msg) {
+                CallAfter([this, is_success, err_code, error_msg]() {
+                       OnConnection(is_success, err_code, error_msg);
                });
-                m_filetransfer_tunnel->start_connect();
-            }
-            catch (const std::exception& e)
-            {
-                BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": tcp FileTransferTunnel unavailable for dev_id=" <<
- dev_id
-                                           << " dev_ip=" << devIP << ": " << e.what();
-                if (m_url_timer && m_url_timer->IsRunning()) m_url_timer->Stop();
-                m_filetransfer_tunnel.reset();
-                m_connection_status = ConnectionStatus::CONNECTION_FAILED;
-                show_status(PrintDialogStatus::PrintStatusPublicInitFailed);
-            }
+            });
+            m_filetransfer_tunnel->start_connect();
        }
        else if (m_tutk_try_connect)
        {
@@ -1768,28 +1749,11 @@ void SendToPrinterDialog::GetConnection()
                if (boost::algorithm::starts_with(url, "bambu:///"))
                {
                    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": Connect method tutk";
-                    try
-                    {
-                        m_filetransfer_tunnel = std::make_unique<FileTransferTunnel>(module(), url);
-                        m_filetransfer_tunnel->on_connection(
-                            [this](bool is_success, int err_code, std::string error_msg)
-                            {
-                                CallAfter([this, is_success, err_code, error_msg]()
-                                {
-                                    OnConnection(is_success, err_code, error_msg);
-                                });
-                            });
-                        m_filetransfer_tunnel->start_connect();
-                    }
-                    catch (const std::exception& e)
-                    {
-                        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": tutk FileTransferTunnel unavailable: " << e.
-what();
-                        if (m_url_timer && m_url_timer->IsRunning()) m_url_timer->Stop();
-                        m_filetransfer_tunnel.reset();
-                        m_connection_status = ConnectionStatus::CONNECTION_FAILED;
-                        show_status(PrintDialogStatus::PrintStatusPublicInitFailed);
-                    }
+                    m_filetransfer_tunnel = std::make_unique<FileTransferTunnel>(module(), url);
+                    m_filetransfer_tunnel->on_connection([this](bool is_success, int err_code, std::string error_msg) {
+                        CallAfter([this, is_success, err_code, error_msg]() { OnConnection(is_success, err_code, error_msg); });
+                    });
+                    m_filetransfer_tunnel->start_connect();
                }
                else
                {
@@ -1888,17 +1852,8 @@ void SendToPrinterDialog::ResetTunnelAndJob()

 void SendToPrinterDialog::CreateMediaAbilityJob()
 {
-    nlohmann::json media_ability = {{"cmd_type", 7}};
-    try
-    {
-        m_filetransfer_mediability_job = std::make_unique<FileTransferJob>(module(), std::string(media_ability.dump()));
-    }
-    catch (const std::exception& e)
-    {
-        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": FileTransferJob unavailable: " << e.what();
-         show_status(PrintDialogStatus::PrintStatusPublicInitFailed);
-         return;
-     }
+     nlohmann::json media_ability = {{"cmd_type", 7}};
+     m_filetransfer_mediability_job = std::make_unique<FileTransferJob>(module(), std::string(media_ability.dump()));
     m_filetransfer_mediability_job->on_result([this](int res, int resp_ec, std::string json_res, std::vector<std::byte> bin_res) {
         //this pl
         CallAfter([this, res, resp_ec, json_res] {
@@ -1953,20 +1908,11 @@ void SendToPrinterDialog::CreateUploadFileJob(const std::string &path, const std
        {"cmd_type", 5},
    };
    upload_params["dest_storage"] = m_selected_storage;
-    upload_params["dest_name"] = name; // filenme no path
-    upload_params["file_path"] = path;
+    upload_params["dest_name"]    = name; // filenme no path
+    upload_params["file_path"]    = path;

-    BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": Begin CreateUploadFileJob";
-    try
-    {
-        m_filetransfer_uploadfile_job = std::make_unique<FileTransferJob>(module(), std::string(upload_params.dump()));
-    }
-    catch (const std::exception& e)
-    {
-        BOOST_LOG_TRIVIAL(warning) << __FUNCTION__ << ": FileTransferJob unavailable: " << e.what();
-        show_status(PrintDialogStatus::PrintStatusPublicUploadFiled);
-        return;
-    }
+      BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ": Begin CreateUploadFileJob";
+    m_filetransfer_uploadfile_job = std::make_unique<FileTransferJob>(module(), std::string(upload_params.dump()));
    m_filetransfer_uploadfile_job->on_result([this](int res, int resp_ec, std::string json_res, std::vector<std::byte> bin_res) { //
        CallAfter([this, res, resp_ec, json_res, bin_res] {
            UploadFileRessultCallback(res, resp_ec,json_res, bin_res);
@@ -22,7 +22,6 @@
 #include <wx/mstream.h>
 #include <wx/sstream.h>
 #include <wx/zstream.h>
-#include <chrono>

 #include "DeviceCore/DevBed.h"
 #include "DeviceCore/DevCtrl.h"
@@ -1494,26 +1493,27 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
    m_setting_button->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
    m_setting_button->SetBackgroundColour(STATUS_TITLE_BG);

-    // m_camera_switch_button = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
-    // m_camera_switch_button->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
-    // m_camera_switch_button->SetBackgroundColour(STATUS_TITLE_BG);
-    // m_camera_switch_button->SetBitmap(m_bitmap_switch_camera.bmp());
-    // m_camera_switch_button->Bind(wxEVT_RIGHT_DOWN, [this](auto& e) {
-    //     const std::string js_request_pip = R"(
-    //         document.querySelector('video').requestPictureInPicture();
-    //     )";
-    //     m_custom_camera_view->RunScript(js_request_pip);
-    // });
-    // m_camera_switch_button->Hide();
+    m_camera_switch_button = new wxStaticBitmap(m_panel_monitoring_title, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize(FromDIP(38), FromDIP(24)), 0);
+    m_camera_switch_button->SetMinSize(wxSize(FromDIP(38), FromDIP(24)));
+    m_camera_switch_button->SetBackgroundColour(STATUS_TITLE_BG);
+    m_camera_switch_button->SetBitmap(m_bitmap_switch_camera.bmp());
+    m_camera_switch_button->Bind(wxEVT_LEFT_DOWN, &StatusBasePanel::on_camera_switch_toggled, this);
+    m_camera_switch_button->Bind(wxEVT_RIGHT_DOWN, [this](auto& e) {
+        const std::string js_request_pip = R"(
+            document.querySelector('video').requestPictureInPicture();
+        )";
+        m_custom_camera_view->RunScript(js_request_pip);
+    });
+    m_camera_switch_button->Hide();

    m_bitmap_sdcard_img->SetToolTip(_L("Storage"));
    m_bitmap_timelapse_img->SetToolTip(_L("Timelapse"));
    m_bitmap_recording_img->SetToolTip(_L("Video"));
    m_bitmap_vcamera_img->SetToolTip(_L("Go Live"));
    m_setting_button->SetToolTip(_L("Camera Setting"));
-    // m_camera_switch_button->SetToolTip(_L("Switch Camera View"));
+    m_camera_switch_button->SetToolTip(_L("Switch Camera View"));

-    // bSizer_monitoring_title->Add(m_camera_switch_button, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
+    bSizer_monitoring_title->Add(m_camera_switch_button, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
    bSizer_monitoring_title->Add(m_bitmap_sdcard_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
    bSizer_monitoring_title->Add(m_bitmap_timelapse_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
    bSizer_monitoring_title->Add(m_bitmap_recording_img, 0, wxALIGN_CENTER_VERTICAL | wxALL, FromDIP(5));
@@ -1536,18 +1536,19 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
    m_custom_camera_view = WebView::CreateWebView(this, wxEmptyString);
    m_custom_camera_view->EnableContextMenu(false);
    Bind(wxEVT_WEBVIEW_NAVIGATING, &StatusBasePanel::on_webview_navigating, this, m_custom_camera_view->GetId());
-    m_web_media_controller = std::make_unique<WebMediaController>(m_custom_camera_view);

    m_media_play_ctrl = new MediaPlayCtrl(this, m_media_ctrl, wxDefaultPosition, wxSize(-1, FromDIP(40)));
-    m_media_play_ctrl->SetWebMediaController(m_web_media_controller.get());
    m_custom_camera_view->Hide();
-    // m_custom_camera_view->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, [this](wxWebViewEvent& evt) {
-    //     if (evt.GetString() == "leavepictureinpicture") {
-    //         // When leaving PiP, video gets paused in some cases and toggling play
-    //         // programmatically does not work.
-    //         m_custom_camera_view->Reload();
-    //     }
-    // });
+    m_custom_camera_view->Bind(wxEVT_WEBVIEW_SCRIPT_MESSAGE_RECEIVED, [this](wxWebViewEvent& evt) {
+        if (evt.GetString() == "leavepictureinpicture") {
+            // When leaving PiP, video gets paused in some cases and toggling play
+            // programmatically does not work.
+            m_custom_camera_view->Reload();
+        }
+        else if (evt.GetString() == "enterpictureinpicture") {
+            toggle_builtin_camera();
+        }
+    });

    sizer->Add(m_media_ctrl, 1, wxEXPAND | wxALL, 0);
    sizer->Add(m_custom_camera_view, 1, wxEXPAND | wxALL, 0);
@@ -1557,6 +1558,10 @@ wxBoxSizer *StatusBasePanel::create_monitoring_page()
 //
 //    sizer->Add(media_ctrl_panel, 1, wxEXPAND | wxALL, 1);

+    if (wxGetApp().app_config->get("camera", "enable_custom_source") == "true") {
+        handle_camera_source_change();
+    }
+
    return sizer;
 }

@@ -2306,27 +2311,6 @@ void StatusPanel::update_camera_state(MachineObject* obj)
 {
    if (!obj) return;

-    auto agent = wxGetApp().getAgent();
-    const auto camera_mode = agent ? agent->get_camera_stream_mode() : CameraStreamMode::none;
-    const bool use_webview = camera_mode == CameraStreamMode::http_snapshot;
-    if (use_webview) {
-        //m_camera_switch_button->Hide();
-        if (!m_custom_camera_view->IsShown()) {
-            // why: do not reload the WebView URL per tick, or redirects can cause a reload loop.
-            // MediaPlayCtrl (via its WebMediaController) owns loading/playing the stream itself.
-            m_custom_camera_view->Show();
-            m_media_ctrl->Hide();
-        }
-    } else {
-        if (m_custom_camera_view->IsShown()) {
-            m_custom_camera_view->Hide();
-            // Stop the snapshot WebView before switching to native playback
-            // or leaving the camera mode.
-            m_media_play_ctrl->StopWebStream();
-        }
-        m_media_ctrl->Show();
-    }
-
    //sdcard
    auto sdcard_state = obj->GetStorage()->get_sdcard_state();
    if (m_last_sdcard != sdcard_state) {
@@ -2358,12 +2342,7 @@ void StatusPanel::update_camera_state(MachineObject* obj)
        m_last_recording = obj->is_recording() ? 1 : 0;
    }

-    if (use_webview) {
-        if (m_bitmap_recording_img->IsShown()) {
-            m_bitmap_recording_img->Hide();
-            m_panel_monitoring_title->Layout();
-        }
-    } else if (!m_bitmap_recording_img->IsShown()) {
+    if (!m_bitmap_recording_img->IsShown()) {
        m_bitmap_recording_img->Show();
        m_panel_monitoring_title->Layout();
    }
@@ -2420,8 +2399,6 @@ void StatusPanel::update_camera_state(MachineObject* obj)
        bool show_vcamera = m_media_play_ctrl->IsStreaming();
        m_camera_popup->update(show_vcamera);
    }
-
-    m_setting_button->Show(!use_webview);
 }

 StatusPanel::StatusPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style, const wxString &name)
@@ -3943,60 +3920,39 @@ void StatusPanel::update_cloud_subtask(MachineObject *obj)
        update_calib_bitmap();
        if (obj->slice_info) {
            m_request_url = wxString(obj->slice_info->thumbnail_url);
-            load_thumbnail_from_url(m_request_url, obj);
+            if (!m_request_url.IsEmpty()) {
+                wxImage                               img;
+                std::map<wxString, wxImage>::iterator it = img_list.find(m_request_url);
+                if (it != img_list.end()) {
+                    if (m_current_print_mode != PrintingTaskType::CALIBRATION  ||(m_calib_mode == CalibMode::Calib_Flow_Rate && m_calib_method == CalibrationMethod::CALI_METHOD_MANUAL)) {
+                        img = it->second;
+                        wxImage resize_img = img.Scale(m_project_task_panel->get_bitmap_thumbnail()->GetSize().x, m_project_task_panel->get_bitmap_thumbnail()->GetSize().y);
+                        m_project_task_panel->set_thumbnail_img(resize_img, "");
+                        m_project_task_panel->set_brightness_value(get_brightness_value(resize_img));
+                    }
+                    if (this->obj) {
+                        m_project_task_panel->set_plate_index(obj->m_plate_index);
+                    } else {
+                        m_project_task_panel->set_plate_index(-1);
+                    }
+                    task_thumbnail_state = ThumbnailState::TASK_THUMBNAIL;
+                    BOOST_LOG_TRIVIAL(trace) << "web_request: use cache image";
+                } else {
+                    web_request = wxWebSession::GetDefault().CreateRequest(this, m_request_url);
+                    BOOST_LOG_TRIVIAL(trace) << "monitor: start request thumbnail, url = " << m_request_url;
+                    web_request.Start();
+                    m_start_loading_thumbnail = false;
+                }
+            }
        }
    }
 }

-bool StatusPanel::load_thumbnail_from_url(const wxString &url, MachineObject *obj)
-{
-    if (url.IsEmpty())
-        return false;
-
-    wxImage                               img;
-    std::map<wxString, wxImage>::iterator it = img_list.find(url);
-    if (it != img_list.end()) {
-        if (m_current_print_mode != PrintingTaskType::CALIBRATION  ||(m_calib_mode == CalibMode::Calib_Flow_Rate && m_calib_method == CalibrationMethod::CALI_METHOD_MANUAL)) {
-            img = it->second;
-            wxImage resize_img = img.Scale(m_project_task_panel->get_bitmap_thumbnail()->GetSize().x, m_project_task_panel->get_bitmap_thumbnail()->GetSize().y);
-            m_project_task_panel->set_thumbnail_img(resize_img, "");
-            m_project_task_panel->set_brightness_value(get_brightness_value(resize_img));
-        }
-        if (this->obj) {
-            m_project_task_panel->set_plate_index(obj->m_plate_index);
-        } else {
-            m_project_task_panel->set_plate_index(-1);
-        }
-        task_thumbnail_state = ThumbnailState::TASK_THUMBNAIL;
-        BOOST_LOG_TRIVIAL(trace) << "web_request: use cache image";
-    } else {
-        m_request_url = url;
-        web_request = wxWebSession::GetDefault().CreateRequest(this, m_request_url);
-        BOOST_LOG_TRIVIAL(trace) << "monitor: start request thumbnail, url = " << m_request_url;
-        web_request.Start();
-        m_start_loading_thumbnail = false;
-    }
-    return true;
-}
-
 void StatusPanel::update_sdcard_subtask(MachineObject *obj)
 {
    if (!obj) return;

-    const wxString thumbnail_url = wxString(obj->m_agent_thumbnail_url);
-    if (!thumbnail_url.IsEmpty()) {
-        if (m_request_url != thumbnail_url || !m_load_sdcard_thumbnail) {
-            if (web_request.IsOk() && web_request.GetState() == wxWebRequest::State_Active)
-                web_request.Cancel();
-            update_calib_bitmap();
-            m_request_url = thumbnail_url;
-            load_thumbnail_from_url(thumbnail_url, obj);
-            m_load_sdcard_thumbnail = true;
-        }
-        return;
-    }
-
-    if (!m_load_sdcard_thumbnail || !m_request_url.IsEmpty()) {
+    if (!m_load_sdcard_thumbnail) {
        update_calib_bitmap();
        if (m_current_print_mode != PrintingTaskType::CALIBRATION) {
            m_project_task_panel->get_bitmap_thumbnail()->SetBitmap(m_thumbnail_sdcard.bmp());
@@ -4004,7 +3960,6 @@ void StatusPanel::update_sdcard_subtask(MachineObject *obj)
        }
        task_thumbnail_state = ThumbnailState::SDCARD_THUMBNAIL;
        m_load_sdcard_thumbnail = true;
-        m_request_url.clear();
    }
 }

@@ -5004,6 +4959,7 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event)
            }
            sdcard_hint_dlg->on_show();
            });
+        m_camera_popup->Bind(EVT_CAM_SOURCE_CHANGE, &StatusPanel::on_camera_source_change, this);
        wxWindow* ctrl = (wxWindow*)event.GetEventObject();
        wxPoint   pos = ctrl->ClientToScreen(wxPoint(0, 0));
        wxSize        sz   = ctrl->GetSize();
@@ -5015,6 +4971,54 @@ void StatusPanel::on_camera_enter(wxMouseEvent& event)
    }
 }

+void StatusBasePanel::on_camera_source_change(wxCommandEvent& event)
+{
+    handle_camera_source_change();
+}
+
+void StatusBasePanel::handle_camera_source_change()
+{
+    const auto new_cam_url = wxGetApp().app_config->get("camera", "custom_source");
+    const auto enabled = wxGetApp().app_config->get("camera", "enable_custom_source") == "true";
+
+    if (enabled && !new_cam_url.empty()) {
+        m_custom_camera_view->LoadURL(new_cam_url);
+        toggle_custom_camera();
+        m_camera_switch_button->Show();
+    } else {
+        toggle_builtin_camera();
+        m_camera_switch_button->Hide();
+    }
+}
+
+void StatusBasePanel::toggle_builtin_camera()
+{
+    m_custom_camera_view->Hide();
+    m_media_ctrl->Show();
+    m_media_play_ctrl->Show();
+}
+
+void StatusBasePanel::toggle_custom_camera()
+{
+    const auto enabled = wxGetApp().app_config->get("camera", "enable_custom_source") == "true";
+
+    if (enabled) {
+        m_custom_camera_view->Show();
+        m_media_ctrl->Hide();
+        m_media_play_ctrl->Hide();
+    }
+}
+
+void StatusBasePanel::on_camera_switch_toggled(wxMouseEvent& event)
+{
+    const auto enabled = wxGetApp().app_config->get("camera", "enable_custom_source") == "true";
+    if (enabled && m_media_ctrl->IsShown()) {
+        toggle_custom_camera();
+    } else {
+        toggle_builtin_camera();
+    }
+}
+
 void StatusBasePanel::remove_controls()
 {
    const std::string js_cleanup_video_element = R"(
@@ -5167,11 +5171,6 @@ bool StatusPanel::is_stage_list_info_changed(MachineObject *obj)
 void StatusPanel::set_default()
 {
    BOOST_LOG_TRIVIAL(trace) << "status_panel: set_default";
-    if (m_custom_camera_view->IsShown()) {
-        m_custom_camera_view->Hide();
-        m_media_ctrl->Show();
-        m_media_play_ctrl->StopWebStream();
-    }
    obj                  = nullptr;
    last_subtask         = nullptr;
    last_tray_exist_bits = -1;
@@ -14,9 +14,7 @@
 #include <wx/sizer.h>
 #include <wx/gbsizer.h>
 #include <wx/webrequest.h>
-#include <memory>
 #include "MediaPlayCtrl.h"
-#include "WebMediaController.hpp"
 #include "AMSSetting.hpp"
 #include "Calibration.hpp"
 #include "CalibrationWizardPage.hpp"
@@ -441,7 +439,7 @@ protected:
    wxStaticBitmap *m_bitmap_sdcard_img;
    wxStaticBitmap *m_bitmap_static_use_time;
    wxStaticBitmap *m_bitmap_static_use_weight;
-    // wxStaticBitmap* m_camera_switch_button;
+    wxStaticBitmap* m_camera_switch_button;


    wxMediaCtrl3 *  m_media_ctrl;
@@ -463,8 +461,6 @@ protected:
    ScalableButton *m_button_abort;
    Button *        m_button_clean;
    wxWebView *     m_custom_camera_view{nullptr};
-    std::unique_ptr<WebMediaController> m_web_media_controller;
-
    wxSimplebook*   m_extruder_book;
    std::vector<ExtruderImage *> m_extruderImage;

@@ -580,8 +576,13 @@ protected:
    virtual void on_axis_ctrl_e_up_10(wxCommandEvent &event) { event.Skip(); }
    virtual void on_axis_ctrl_e_down_10(wxCommandEvent &event) { event.Skip(); }
    virtual void on_nozzle_selected(wxCommandEvent &event) { event.Skip(); }
+    void on_camera_source_change(wxCommandEvent& event);
+    void handle_camera_source_change();
    void remove_controls();
    void on_webview_navigating(wxWebViewEvent& evt);
+    void on_camera_switch_toggled(wxMouseEvent& event);
+    void toggle_custom_camera();
+    void toggle_builtin_camera();

 public:
    StatusBasePanel(wxWindow *      parent,
@@ -628,7 +629,6 @@ class StatusPanel : public StatusBasePanel
 {
 private:
    friend class MonitorPanel;
-    bool load_thumbnail_from_url(const wxString &url, MachineObject *obj);

 protected:
    std::shared_ptr<SliceInfoPopup> m_slice_info_popup;
@@ -1863,6 +1863,7 @@ bool SyncAmsInfoDialog::is_blocking_printing(MachineObject *obj_)
 {
    DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
    if (!dev) return true;
+    auto        target_model = obj_->printer_type;
    std::string source_model = "";

    if (m_print_type == PrintFromType::FROM_NORMAL) {
@@ -1873,7 +1874,13 @@ bool SyncAmsInfoDialog::is_blocking_printing(MachineObject *obj_)
        if (m_required_data_plate_data_list.size() > 0) { source_model = m_required_data_plate_data_list[m_print_plate_idx]->printer_model_id; }
    }

-    return !DevPrinterConfigUtil::is_printer_model_compatible(source_model, *obj_);
+    if (source_model != target_model) {
+        std::vector<std::string>      compatible_machine = obj_->get_compatible_machine();
+        vector<std::string>::iterator it                 = find(compatible_machine.begin(), compatible_machine.end(), source_model);
+        if (it == compatible_machine.end()) { return true; }
+    }
+
+    return false;
 }

 bool SyncAmsInfoDialog::is_same_nozzle_type(std::string &filament_type, NozzleType &tag_nozzle_type)
@@ -1923,13 +1930,7 @@ bool SyncAmsInfoDialog::is_same_printer_model()
    if (obj_ == nullptr) { return result; }

    PresetBundle *preset_bundle = wxGetApp().preset_bundle;
-    const std::string source_model = preset_bundle ? preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle) : std::string();
-    if (DevPrinterConfigUtil::is_optional_printer_model_id(source_model) ||
-        DevPrinterConfigUtil::is_optional_printer_model_id(obj_->printer_type)) {
-        return true;
-    }
-
-    if (preset_bundle && source_model != obj_->printer_type) {
+    if (preset_bundle && preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle) != obj_->printer_type) {
        if ((obj_->is_support_upgrade_kit && obj_->installed_upgrade_kit) && (preset_bundle->printers.get_edited_preset().get_printer_type(preset_bundle) == "C12")) {
            return true;
        }
@@ -2130,7 +2131,7 @@ void SyncAmsInfoDialog::update_user_printer()
    std::map<std::string, MachineObject *> option_list;

    // user machine list
-    option_list = dev->get_my_machine_list(dev->get_current_printer_agent_id());
+    option_list = dev->get_my_machine_list();

    // same machine only appear once
    for (auto it = option_list.begin(); it != option_list.end(); it++) {
@@ -3205,7 +3206,6 @@ SyncAmsInfoDialog::~SyncAmsInfoDialog() {
 void SyncAmsInfoDialog::set_info(SyncInfo &info)
 {
    m_input_info = info;
-    reinit_dialog();
 }

 void SyncAmsInfoDialog::update_lan_machine_list()
@@ -1,78 +0,0 @@
-#include "WebMediaController.hpp"
-
-#include <wx/webview.h>
-
-namespace Slic3r { namespace GUI {
-
-WebMediaController::WebMediaController(wxWebView* webview) : m_webview(webview)
-{
-    if (!m_webview)
-        return;
-
-    m_webview->SetBackgroundColour(*wxBLACK);
-    m_webview->SetPage("<html><head><style>html,body{margin:0;height:100%;background:#000;}</style></head><body></body></html>", "");
-}
-
-void WebMediaController::Load(wxURI url)
-{
-    m_url = url.BuildURI().ToStdString();
-}
-
-void WebMediaController::set_mode(CameraStreamMode mode)
-{
-    m_stream_mode = mode;
-}
-
-void WebMediaController::Play()
-{
-    if (!m_webview)
-        return;
-
-    wxString url  = wxString::FromUTF8(m_url);
-    wxString html = "<html><head><style>"
-                    "html,body{margin:0;height:100%;background:#000;overflow:hidden;}"
-                    "img{width:100%;height:100%;object-fit:contain;display:block;}"
-                    "</style></head><body><img id=\"camera-frame\"";
-    if (m_stream_mode == CameraStreamMode::http_snapshot) {
-        html += " data-camera-url=\"" + url +
-                "\"><script>"
-                "const cameraFrame=document.getElementById('camera-frame');"
-                "const cameraUrl=cameraFrame.dataset.cameraUrl;"
-                "let cameraFrameLoading=false;"
-                "function refreshCameraFrame(){"
-                "if(cameraFrameLoading)return;"
-                "cameraFrameLoading=true;"
-                "const nextFrame=new Image();"
-                "nextFrame.onload=function(){cameraFrame.src=nextFrame.src;cameraFrameLoading=false;};"
-                "nextFrame.onerror=function(){cameraFrameLoading=false;};"
-                "nextFrame.src=cameraUrl+(cameraUrl.indexOf('?')>=0?'&':'?')+'_orca_frame='+Date.now();"
-                "}"
-                "let cameraRefreshInterval=null;"
-                "function stopCameraRefresh(){"
-                "if(cameraRefreshInterval!==null){"
-                "clearInterval(cameraRefreshInterval);"
-                "cameraRefreshInterval=null;"
-                "}"
-                "}"
-                "refreshCameraFrame();"
-                "cameraRefreshInterval = setInterval(refreshCameraFrame,200);"
-                "</script></body></html>";
-        m_webview->SetPage(html, url);
-    } else {
-        // Load MJPEG streams as the top-level document.  Some embedded WebView
-        // backends buffer a multipart stream when it is used as an <img> resource,
-        // which introduces noticeable live-view latency.
-        m_webview->LoadURL(url);
-    }
-}
-
-void WebMediaController::Stop()
-{
-    if (m_webview) {
-        m_webview->RunScript("if(typeof stopCameraRefresh==='function') stopCameraRefresh();");
-        m_webview->Stop();
-    }
-    m_url.clear();
-}
-
-}} // namespace Slic3r::GUI
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <slic3r/GUI/IMediaController.hpp>
-#include <slic3r/Utils/IPrinterAgent.hpp>
-
-#include <string>
-
-class wxWebView;
-
-namespace Slic3r { namespace GUI {
-
-class WebMediaController : public IMediaController
-{
-public:
-    explicit WebMediaController(wxWebView* webview);
-
-    void Load(wxURI url) override;
-
-    void set_mode(CameraStreamMode mode);
-
-    void Play() override;
-
-    void Stop() override;
-
-private:
-    wxWebView* m_webview;
-    std::string m_url;
-    CameraStreamMode m_stream_mode = CameraStreamMode::http;
-};
-
-}} // namespace Slic3r::GUI
@@ -1,401 +0,0 @@
-#include "WebRtcMediaController.hpp"
-
-#include <rtc/common.hpp>
-#include <rtc/rtc.hpp>
-
-#include <mutex>
-#include <wx/mstream.h>
-
-#include <boost/log/trivial.hpp>
-
-namespace {
-void init_rtc_logger_once()
-{
-    static std::once_flag flag;
-    std::call_once(flag, [] {
-        rtc::InitLogger(rtc::LogLevel::Warning, [](rtc::LogLevel level, std::string message) {
-            BOOST_LOG_TRIVIAL(trace) << "[rtc:" << static_cast<int>(level) << "] " << message;
-        });
-    });
-}
-} // namespace
-
-namespace Slic3r { namespace GUI {
-
-WebRtcMediaController::WebRtcMediaController(std::function<void(const wxImage&, wxSize)> frame_sink,
-                                             std::function<void(Status)> on_status)
-    : m_frame_sink(std::move(frame_sink))
-    , m_on_status(std::move(on_status))
-{
-}
-
-WebRtcMediaController::~WebRtcMediaController()
-{
-    Stop();
-}
-
-void WebRtcMediaController::report(Status status)
-{
-    status.epoch = m_epoch.load();
-    BOOST_LOG_TRIVIAL(info) << "WebRTC: report kind=" << static_cast<int>(status.kind)
-                            << " code=" << static_cast<int>(status.code) << " epoch=" << status.epoch;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        if (status.kind == Status::Connecting)
-            m_state = static_cast<wxMediaState>(4);
-        else if (status.kind == Status::Playing)
-            m_state = wxMEDIASTATE_PLAYING;
-        else
-            m_state = static_cast<wxMediaState>(3);
-    }
-    if (m_on_status)
-        m_on_status(status);
-}
-
-void WebRtcMediaController::set_signalling_channel(std::unique_ptr<ICameraSignalingChannel> channel)
-{
-    m_pending_signaling = std::move(channel);
-}
-
-void WebRtcMediaController::Play()
-{
-    std::unique_ptr<ICameraSignalingChannel> channel = std::move(m_pending_signaling);
-    // Tear down any previous attempt WITHOUT notifying: the Stopped that would
-    // otherwise be delivered (async, via CallAfter) races the new attempt's
-    // Connecting and makes the consumer cancel a session that is mid-connect.
-    teardown(false);
-    if (!channel)
-        return;
-
-    m_epoch.fetch_add(1);
-    m_alive.store(true);
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_signaling = std::move(channel);
-        m_jpeg_queue.clear();
-        m_pending_candidates.clear();
-        m_remote_description_set = false;
-        m_video_size = wxDefaultSize;
-        m_has_frame = false;
-        m_last_frame_time = {};
-    }
-
-    ICameraSignalingChannel* signaling = nullptr;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        signaling = m_signaling.get();
-    }
-    signaling->on_ready = [this](std::vector<CameraIceServer> servers) {
-        if (m_alive.load())
-            on_ready(std::move(servers));
-    };
-    signaling->on_answer = [this](std::string sdp) {
-        if (m_alive.load())
-            on_answer(std::move(sdp));
-    };
-    signaling->on_ice = [this](std::string candidate, std::string mid) {
-        if (m_alive.load())
-            on_ice(std::move(candidate), std::move(mid));
-    };
-    signaling->on_unavailable = [this](CameraUnavailableReason reason, std::string detail) {
-        if (m_alive.load())
-            on_unavailable(reason, std::move(detail));
-    };
-
-    m_decode_thread = std::thread([this] { decode_loop(); });
-    report({Status::Connecting});
-    signaling->open();
-}
-
-void WebRtcMediaController::Stop()
-{
-    teardown(true);
-}
-
-void WebRtcMediaController::teardown(bool notify)
-{
-    const bool was_alive = m_alive.exchange(false);
-    if (!was_alive && !m_decode_thread.joinable())
-        return;
-
-    m_cond.notify_all();
-    std::unique_ptr<ICameraSignalingChannel> signaling;
-    std::shared_ptr<rtc::PeerConnection> peer_connection;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        signaling = std::move(m_signaling);
-        peer_connection = std::move(m_peer_connection);
-        m_data_channel.reset();
-    }
-    if (signaling)
-        signaling->close();
-    if (peer_connection)
-        peer_connection->close();
-    if (m_decode_thread.joinable())
-        m_decode_thread.join();
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_jpeg_queue.clear();
-    }
-    if (was_alive && notify)
-        report({Status::Stopped});
-}
-
-wxMediaState WebRtcMediaController::GetState()
-{
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return m_state;
-}
-
-wxSize WebRtcMediaController::GetVideoSize() const
-{
-    std::lock_guard<std::mutex> lock(m_mutex);
-    return m_video_size;
-}
-
-void WebRtcMediaController::bind_data_channel(const std::shared_ptr<rtc::DataChannel>& dc)
-{
-    const std::string label = dc->label();
-    dc->onOpen([label] { BOOST_LOG_TRIVIAL(info) << "WebRTC: data channel '" << label << "' open"; });
-    dc->onClosed([label] { BOOST_LOG_TRIVIAL(info) << "WebRTC: data channel '" << label << "' closed"; });
-    dc->onError([label](std::string e) {
-        BOOST_LOG_TRIVIAL(warning) << "WebRTC: data channel '" << label << "' error: " << e;
-    });
-    dc->onMessage(
-        [this](rtc::binary data) {
-            if (m_alive.load())
-                enqueue_jpeg(std::vector<std::byte>(data.begin(), data.end()));
-        },
-        [](rtc::string) {});
-}
-
-void WebRtcMediaController::on_ready(std::vector<CameraIceServer> servers)
-{
-    init_rtc_logger_once();
-    rtc::Configuration configuration;
-    // Allow complete-JPEG DataChannel messages up to 1 MiB. This value is
-    // advertised in SDP and becomes the upper bound for frames OrcaSonar can
-    // send to OrcaSlicer.
-    configuration.maxMessageSize = 1024 * 1024;
-    for (const CameraIceServer& server : servers) {
-        try {
-            rtc::IceServer ice_server(server.urls);
-            ice_server.username = server.username;
-            ice_server.password = server.credential;
-            configuration.iceServers.emplace_back(std::move(ice_server));
-        } catch (const std::exception& e) {
-            BOOST_LOG_TRIVIAL(warning) << "WebRTC: invalid ICE server: " << e.what();
-        }
-    }
-
-    BOOST_LOG_TRIVIAL(info) << "WebRTC: creating peer connection with " << configuration.iceServers.size() << " ice servers";
-    auto peer_connection = std::make_shared<rtc::PeerConnection>(std::move(configuration));
-    peer_connection->onLocalDescription([this](rtc::Description description) {
-        if (!m_alive.load())
-            return;
-        const std::string sdp(description);
-        BOOST_LOG_TRIVIAL(info) << "WebRTC: local description ready (" << description.typeString()
-                                << "), OFFER SDP:\n" << sdp;
-        std::lock_guard<std::mutex> lock(m_mutex);
-        if (m_signaling)
-            m_signaling->send_offer(sdp);
-    });
-    peer_connection->onLocalCandidate([this](rtc::Candidate candidate) {
-        if (!m_alive.load())
-            return;
-        std::lock_guard<std::mutex> lock(m_mutex);
-        if (m_signaling)
-            m_signaling->send_ice(std::string(candidate), candidate.mid());
-    });
-    peer_connection->onStateChange([this](rtc::PeerConnection::State state) {
-        BOOST_LOG_TRIVIAL(info) << "WebRTC: peer state -> " << static_cast<int>(state);
-        if (!m_alive.load())
-            return;
-        if (state == rtc::PeerConnection::State::Failed || state == rtc::PeerConnection::State::Disconnected)
-            report({Status::Failed, Status::ICE_FAILED});
-    });
-    peer_connection->onGatheringStateChange([](rtc::PeerConnection::GatheringState state) {
-        BOOST_LOG_TRIVIAL(info) << "WebRTC: gathering state -> " << static_cast<int>(state);
-    });
-
-    // Accept a DataChannel opened by the remote peer (OrcaSonar may create the
-    // "camera" channel from its side rather than answering the one we offer).
-    peer_connection->onDataChannel([this](std::shared_ptr<rtc::DataChannel> dc) {
-        BOOST_LOG_TRIVIAL(info) << "WebRTC: remote opened data channel '" << dc->label() << "'";
-        bind_data_channel(dc);
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_data_channel = std::move(dc);
-    });
-
-    rtc::DataChannelInit init;
-    init.reliability.unordered = true;
-    // init.reliability.maxPacketLifeTime = std::chrono::milliseconds(350);
-    // Request one complete JPEG frame per DataChannel message. OrcaSonar
-    // keeps the legacy chunked protocol for clients that omit this property.
-    init.protocol = "orca-jpeg";
-    auto data_channel = peer_connection->createDataChannel("camera", init);
-    if (data_channel)
-        bind_data_channel(data_channel);
-
-    // Camera media is carried as one complete JPEG per DataChannel message;
-    // no RTP video track or application-level framing is required.
-
-    std::shared_ptr<rtc::PeerConnection> peer_for_description;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        if (!m_alive.load())
-            return;
-        m_peer_connection = std::move(peer_connection);
-        peer_for_description = m_peer_connection;
-        m_data_channel = std::move(data_channel);
-    }
-    if (peer_for_description)
-        peer_for_description->setLocalDescription();
-}
-
-void WebRtcMediaController::on_answer(std::string sdp)
-{
-    std::shared_ptr<rtc::PeerConnection> peer_connection;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        peer_connection = m_peer_connection;
-    }
-    BOOST_LOG_TRIVIAL(info) << "WebRTC: applying remote answer (" << sdp.size() << " bytes), ANSWER SDP:\n" << sdp;
-    if (!peer_connection)
-        return;
-    try {
-        peer_connection->setRemoteDescription(rtc::Description(sdp, "answer"));
-    } catch (const std::exception& e) {
-        BOOST_LOG_TRIVIAL(warning) << "WebRTC: setRemoteDescription failed: " << e.what();
-        report({Status::Failed, Status::ICE_FAILED});
-        return;
-    }
-
-    // Flush any remote candidates that arrived before the answer.
-    std::vector<std::pair<std::string, std::string>> pending;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_remote_description_set = true;
-        pending.swap(m_pending_candidates);
-    }
-    BOOST_LOG_TRIVIAL(info) << "WebRTC: remote description set, flushing " << pending.size()
-                            << " buffered candidate(s)";
-    for (const auto& c : pending) {
-        try {
-            peer_connection->addRemoteCandidate(rtc::Candidate(c.first, c.second));
-        } catch (const std::exception& e) {
-            BOOST_LOG_TRIVIAL(warning) << "WebRTC: addRemoteCandidate (buffered) failed: " << e.what();
-        }
-    }
-}
-
-void WebRtcMediaController::on_ice(std::string candidate, std::string mid)
-{
-    std::shared_ptr<rtc::PeerConnection> peer_connection;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        if (!m_remote_description_set) {
-            m_pending_candidates.emplace_back(std::move(candidate), std::move(mid));
-            return;
-        }
-        peer_connection = m_peer_connection;
-    }
-    if (!peer_connection)
-        return;
-    try {
-        peer_connection->addRemoteCandidate(rtc::Candidate(candidate, mid));
-    } catch (const std::exception& e) {
-        BOOST_LOG_TRIVIAL(warning) << "WebRTC: addRemoteCandidate failed: " << e.what();
-    }
-}
-
-void WebRtcMediaController::on_unavailable(CameraUnavailableReason reason, std::string detail)
-{
-    BOOST_LOG_TRIVIAL(warning) << "WebRTC camera unavailable: " << detail;
-    Status::Code code = Status::UNAVAILABLE_ERROR;
-    if (reason == CameraUnavailableReason::Busy)
-        code = Status::UNAVAILABLE_BUSY;
-    else if (reason == CameraUnavailableReason::Disabled)
-        code = Status::UNAVAILABLE_DISABLED;
-    else if (reason == CameraUnavailableReason::Closed)
-        code = Status::SIGNALING_CLOSED;
-    report({Status::Failed, code});
-}
-
-void WebRtcMediaController::enqueue_jpeg(std::vector<std::byte> jpeg)
-{
-    std::lock_guard<std::mutex> lock(m_mutex);
-    if (m_jpeg_queue.size() >= 4)
-        m_jpeg_queue.pop_front();
-    m_jpeg_queue.emplace_back(std::move(jpeg));
-    m_cond.notify_one();
-}
-
-void WebRtcMediaController::deliver_jpeg(std::vector<std::byte> jpeg)
-{
-    const auto now = std::chrono::steady_clock::now();
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        if (m_last_frame_time != std::chrono::steady_clock::time_point{} &&
-            now - m_last_frame_time < std::chrono::milliseconds(33))
-            return;
-        m_last_frame_time = now;
-    }
-    wxMemoryInputStream stream(jpeg.data(), jpeg.size());
-    wxImage image;
-    if (!image.LoadFile(stream, wxBITMAP_TYPE_JPEG)) {
-        report({Status::Failed, Status::DECODE_ERROR});
-        return;
-    }
-    bool first_frame = false;
-    {
-        std::lock_guard<std::mutex> lock(m_mutex);
-        m_video_size = image.GetSize();
-        first_frame = !m_has_frame;
-        m_has_frame = true;
-    }
-    if (m_frame_sink)
-        m_frame_sink(image, image.GetSize());
-    if (first_frame)
-        report({Status::Playing});
-}
-
-void WebRtcMediaController::decode_loop()
-{
-    int stall_polls = 0;
-    std::unique_lock<std::mutex> lock(m_mutex);
-    while (m_alive.load()) {
-        const bool woke = m_cond.wait_for(lock, std::chrono::seconds(2), [this] {
-            return !m_alive.load() || !m_jpeg_queue.empty();
-        });
-        if (!m_alive.load())
-            break;
-        if (!woke && !m_has_frame) {
-            const int pc_state = m_peer_connection ? static_cast<int>(m_peer_connection->state()) : -1;
-            std::string dc = "none";
-            if (m_data_channel)
-                dc = "label='" + m_data_channel->label() + "' open=" +
-                     (m_data_channel->isOpen() ? "1" : "0");
-            lock.unlock();
-            BOOST_LOG_TRIVIAL(info) << "WebRTC: waiting for frames; peer_state=" << pc_state
-                                    << " data_channel=" << dc;
-            if (++stall_polls >= 8) { // ~16s connected with no frame -> give up so the UI can retry
-                report({Status::Failed, Status::TIMEOUT});
-                lock.lock();
-                break;
-            }
-            lock.lock();
-            continue;
-        }
-        stall_polls = 0;
-        if (!m_jpeg_queue.empty()) {
-            auto jpeg = std::move(m_jpeg_queue.front());
-            m_jpeg_queue.pop_front();
-            lock.unlock();
-            deliver_jpeg(std::move(jpeg));
-            lock.lock();
-        }
-    }
-}
-
-}} // namespace Slic3r::GUI
@@ -1,93 +0,0 @@
-#pragma once
-
-#include "IMediaController.hpp"
-#include <slic3r/Utils/IPrinterAgent.hpp>
-
-#include <wx/image.h>
-
-#include <atomic>
-#include <chrono>
-#include <cstddef>
-#include <condition_variable>
-#include <cstdint>
-#include <deque>
-#include <functional>
-#include <memory>
-#include <mutex>
-#include <thread>
-#include <vector>
-
-namespace rtc {
-class DataChannel;
-class PeerConnection;
-}
-
-namespace Slic3r { namespace GUI {
-
-class WebRtcMediaController : public IMediaController {
-public:
-    struct Status {
-        enum Kind { Connecting, Playing, Stopped, Failed } kind = Stopped;
-        enum Code {
-            ICE_FAILED,
-            SIGNALING_CLOSED,
-            UNAVAILABLE_BUSY,
-            UNAVAILABLE_ERROR,
-            UNAVAILABLE_DISABLED,
-            DECODE_ERROR,
-            TIMEOUT,
-        } code = ICE_FAILED;
-        // Identifies the Play attempt this status belongs to, so the
-        // consumer can drop CallAfter-queued events from a superseded attempt.
-        std::uint64_t epoch = 0;
-    };
-
-    WebRtcMediaController(std::function<void(const wxImage&, wxSize)> frame_sink,
-                          std::function<void(Status)> on_status);
-    ~WebRtcMediaController() override;
-
-    void set_signalling_channel(std::unique_ptr<ICameraSignalingChannel> channel);
-    std::uint64_t epoch() const { return m_epoch.load(); }
-    bool is_active() const { return m_alive.load(); }
-
-    void Load(wxURI) override {}
-    void Play() override;
-    void Stop() override;
-    wxMediaState GetState() override;
-    wxSize GetVideoSize() const override;
-
-private:
-    void teardown(bool notify);
-    void report(Status status);
-    void bind_data_channel(const std::shared_ptr<rtc::DataChannel>& dc);
-    void on_ready(std::vector<CameraIceServer> servers);
-    void on_answer(std::string sdp);
-    void on_ice(std::string candidate, std::string mid);
-    void on_unavailable(CameraUnavailableReason reason, std::string detail);
-    void decode_loop();
-    void enqueue_jpeg(std::vector<std::byte> jpeg);
-    void deliver_jpeg(std::vector<std::byte> jpeg);
-
-    mutable std::mutex m_mutex;
-    std::condition_variable m_cond;
-    std::deque<std::vector<std::byte>> m_jpeg_queue;
-    // Remote candidates can arrive before the answer; libdatachannel rejects
-    // addRemoteCandidate until a remote description is set, so buffer them.
-    std::vector<std::pair<std::string, std::string>> m_pending_candidates;
-    bool m_remote_description_set = false;
-    std::unique_ptr<ICameraSignalingChannel> m_pending_signaling;
-    std::unique_ptr<ICameraSignalingChannel> m_signaling;
-    std::shared_ptr<rtc::PeerConnection> m_peer_connection;
-    std::shared_ptr<rtc::DataChannel> m_data_channel;
-    std::thread m_decode_thread;
-    std::atomic<bool> m_alive{false};
-    std::atomic<std::uint64_t> m_epoch{0};
-    wxMediaState m_state = static_cast<wxMediaState>(3);
-    wxSize m_video_size = wxDefaultSize;
-    std::function<void(const wxImage&, wxSize)> m_frame_sink;
-    std::function<void(Status)> m_on_status;
-    bool m_has_frame = false;
-    std::chrono::steady_clock::time_point m_last_frame_time{};
-};
-
-}} // namespace Slic3r::GUI
@@ -4,14 +4,6 @@
 #include "libslic3r/Utils.hpp"
 #include <boost/log/trivial.hpp>
 #include <wx/dcclient.h>
-#include <cstdarg>
-#include <cstdlib>
-#include <cstring>
-#include <mutex>
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavutil/log.h>
-}
 #ifdef __WIN32__
 #include <versionhelpers.h>
 #include <wx/msw/registry.h>
@@ -51,13 +43,9 @@ wxMediaCtrl3::~wxMediaCtrl3()
    m_thread.join();
 }

-static void adjust_frame_size(wxSize& frame, wxSize const& video, wxSize const& window);
-
 void wxMediaCtrl3::Load(wxURI url)
 {
    std::unique_lock<std::mutex> lk(m_mutex);
-    if (m_external)
-        return;
    m_video_size = wxDefaultSize;
    m_error = 0;
    m_url.reset(new wxURI(url));
@@ -67,8 +55,6 @@ void wxMediaCtrl3::Load(wxURI url)
 void wxMediaCtrl3::Play()
 {
    std::unique_lock<std::mutex> lk(m_mutex);
-    if (m_external)
-        return;
    if (m_state != wxMEDIASTATE_PLAYING) {
        m_state = wxMEDIASTATE_PLAYING;
        wxMediaEvent event(wxEVT_MEDIA_STATECHANGED);
@@ -88,62 +74,6 @@ void wxMediaCtrl3::Stop()
    Refresh();
 }

-void wxMediaCtrl3::SetExternalFrame(const wxImage& frame, wxSize videoSize)
-{
-    if (!frame.IsOk())
-        return;
-    {
-        std::unique_lock<std::mutex> lk(m_mutex);
-        if (!m_external)
-            return;
-        m_frame = frame;
-        m_video_size = videoSize.IsFullySpecified() ? videoSize : frame.GetSize();
-        adjust_frame_size(m_frame_size, m_video_size, GetSize());
-    }
-    CallAfter([this] { Refresh(); });
-}
-
-#ifdef _WIN32
-void wxMediaCtrl3::SetExternalFrame(const wxBitmap& frame, wxSize videoSize)
-{
-    if (!frame.IsOk())
-        return;
-    {
-        std::unique_lock<std::mutex> lk(m_mutex);
-        if (!m_external)
-            return;
-        m_frame = frame;
-        m_video_size = videoSize.IsFullySpecified() ? videoSize : frame.GetSize();
-        adjust_frame_size(m_frame_size, m_video_size, GetSize());
-    }
-    CallAfter([this] { Refresh(); });
-}
-#endif
-
-void wxMediaCtrl3::BeginExternalStream()
-{
-    std::unique_lock<std::mutex> lk(m_mutex);
-    m_external = true;
-    m_url.reset();
-    m_active_url.reset();
-    m_video_size = wxDefaultSize;
-    m_frame = wxImage(m_idle_image);
-    m_cond.notify_all();
-    Refresh();
-}
-
-void wxMediaCtrl3::EndExternalStream()
-{
-    std::unique_lock<std::mutex> lk(m_mutex);
-    m_external = false;
-    m_url.reset();
-    m_active_url.reset();
-    m_video_size = wxDefaultSize;
-    m_frame = wxImage(m_idle_image);
-    m_cond.notify_all();
-    Refresh();
-}
-
 void wxMediaCtrl3::SetIdleImage(wxString const &image)
 {
    if (m_idle_image == image)
@@ -163,13 +93,13 @@ wxMediaState wxMediaCtrl3::GetState()
    return m_state;
 }

-int wxMediaCtrl3::GetLastError() const
+int wxMediaCtrl3::GetLastError()
 {
    std::unique_lock<std::mutex> lk(m_mutex);
    return m_error;
 }

-wxSize wxMediaCtrl3::GetVideoSize() const
+wxSize wxMediaCtrl3::GetVideoSize()
 {
    std::unique_lock<std::mutex> lk(m_mutex);
    return m_video_size;
@@ -255,210 +185,6 @@ void wxMediaCtrl3::bambu_log(void *ctx, int level, tchar const *msg2)
    BOOST_LOG_TRIVIAL(info) << msg.ToUTF8().data();
 }

-// FFmpeg's own diagnostics (HTTP status, "Invalid data found", demuxer choice,
-// missing stream dimensions, ...) are otherwise swallowed: a failed camera open
-// only surfaces as wxMediaCtrl3's generic error code, which MediaPlayCtrl maps to
-// the misleading "Player is malfunctioning" string. Forward them to the Orca log
-// instead. Verbosity defaults to AV_LOG_VERBOSE and can be raised at runtime with
-// ORCA_FFMPEG_LOG_LEVEL=debug|trace|... (or lowered to warning/error/quiet).
-static int ffmpeg_log_level_from_env()
-{
-    const char *env = std::getenv("ORCA_FFMPEG_LOG_LEVEL");
-    if (env == nullptr || *env == '\0')
-        return AV_LOG_VERBOSE;
-    const wxString v = wxString(env).Lower();
-    if (v == "quiet")   return AV_LOG_QUIET;
-    if (v == "panic")   return AV_LOG_PANIC;
-    if (v == "fatal")   return AV_LOG_FATAL;
-    if (v == "error")   return AV_LOG_ERROR;
-    if (v == "warning") return AV_LOG_WARNING;
-    if (v == "info")    return AV_LOG_INFO;
-    if (v == "verbose") return AV_LOG_VERBOSE;
-    if (v == "debug")   return AV_LOG_DEBUG;
-    if (v == "trace")   return AV_LOG_TRACE;
-    return AV_LOG_VERBOSE;
-}
-
-static void ffmpeg_log_callback(void *avcl, int level, const char *fmt, va_list vl)
-{
-    if (level > av_log_get_level())
-        return;
-    thread_local int print_prefix = 1;
-    char line[1024];
-    av_log_format_line2(avcl, level, fmt, vl, line, (int) sizeof(line), &print_prefix);
-    size_t len = std::strlen(line);
-    while (len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r' || line[len - 1] == ' '))
-        line[--len] = '\0';
-    if (len == 0)
-        return;
-    if (level <= AV_LOG_ERROR)
-        BOOST_LOG_TRIVIAL(error) << "ffmpeg: " << line;
-    else if (level <= AV_LOG_WARNING)
-        BOOST_LOG_TRIVIAL(warning) << "ffmpeg: " << line;
-    else if (level <= AV_LOG_INFO)
-        BOOST_LOG_TRIVIAL(info) << "ffmpeg: " << line;
-    else
-        BOOST_LOG_TRIVIAL(debug) << "ffmpeg: " << line;
-}
-
-static void install_ffmpeg_logger()
-{
-    av_log_set_level(ffmpeg_log_level_from_env());
-    av_log_set_callback(&ffmpeg_log_callback);
-}
-
-int wxMediaCtrl3::ffmpeg_interrupt_callback(void *opaque)
-{
-    auto *ctrl = static_cast<wxMediaCtrl3 *>(opaque);
-    std::lock_guard<std::mutex> lock(ctrl->m_mutex);
-    return ctrl->m_url != ctrl->m_active_url;
-}
-
-int wxMediaCtrl3::PlayFfmpeg(std::shared_ptr<wxURI> const &url, std::unique_lock<std::mutex> &lock)
-{
-    static std::once_flag logger_once;
-    std::call_once(logger_once, install_ffmpeg_logger);
-
-    if (avformat_network_init() < 0)
-        return 2;
-
-    AVFormatContext *format_context = avformat_alloc_context();
-    if (!format_context) {
-        avformat_network_deinit();
-        return 2;
-    }
-
-    format_context->interrupt_callback = {&wxMediaCtrl3::ffmpeg_interrupt_callback, this};
-    format_context->flags |= AVFMT_FLAG_NOBUFFER;
-    format_context->max_delay = 0;
-    m_active_url = url;
-
-    auto finish = [&](int error) {
-        lock.unlock();
-        avformat_close_input(&format_context);
-        avformat_network_deinit();
-        lock.lock();
-        m_active_url.reset();
-        return error;
-    };
-
-    const std::string uri = url->BuildURI().ToUTF8().data();
-    const wxString scheme = url->GetScheme();
-    const bool http_stream = scheme.CmpNoCase("http") == 0 || scheme.CmpNoCase("https") == 0;
-    AVDictionary *options = nullptr;
-    if (http_stream) {
-        // Live multipart MJPEG. fflags=nobuffer / AVFMT_FLAG_NOBUFFER / max_delay=0
-        // (set above) are the low-latency levers - they disable the demuxer
-        // read-ahead queue. probesize / analyzeduration only bound the one-off
-        // avformat_find_stream_info() at open; a 32-byte budget returned before a
-        // whole JPEG frame was seen, so width/height came back unset and the open
-        // was rejected. Give it room to identify one frame (a startup cost only).
-        // rw_timeout / timeout bound a wedged connect or read so a stale stream
-        // fails fast and is retried, instead of the reader thread hanging.
-        // avioflags=direct is deliberately NOT set: unbuffered reads make the
-        // mpjpeg demuxer emit "Packet corrupt" and bail on any short read across
-        // a multipart boundary.
-        av_dict_set(&options, "fflags", "nobuffer", 0);
-        av_dict_set(&options, "probesize", "5000000", 0);
-        av_dict_set(&options, "analyzeduration", "1000000", 0);
-        av_dict_set(&options, "rw_timeout", "5000000", 0);
-        av_dict_set(&options, "timeout", "5000000", 0);
-    } else {
-        av_dict_set(&options, "rtsp_transport", "tcp", 0);
-    }
-    lock.unlock();
-    int error = avformat_open_input(&format_context, uri.c_str(), nullptr, &options);
-    av_dict_free(&options);
-    lock.lock();
-    if (error < 0)
-        return finish(2);
-
-    lock.unlock();
-    error = avformat_find_stream_info(format_context, nullptr);
-    lock.lock();
-    if (error < 0)
-        return finish(2);
-
-    const int video_stream = av_find_best_stream(format_context, AVMEDIA_TYPE_VIDEO, -1, -1, nullptr, 0);
-    if (video_stream < 0)
-        return finish(2);
-
-    AVVideoDecoder decoder;
-    if (decoder.open(*format_context->streams[video_stream]->codecpar) < 0)
-        return finish(2);
-
-    // Prefer the dimensions the container reported. A small probe budget, or a
-    // camera that doesn't announce a size up front, can leave these unset - in
-    // that case fill them in from the first frame that decodes (below) rather
-    // than failing the open outright.
-    auto apply_video_size = [&](wxSize size) {
-        if (!size.IsFullySpecified() || size.x <= 0 || size.y <= 0)
-            return false;
-        m_video_size = size;
-        adjust_frame_size(m_frame_size, m_video_size, GetSize());
-        NotifyStopped();
-        return true;
-    };
-    bool have_size = apply_video_size({format_context->streams[video_stream]->codecpar->width,
-                                      format_context->streams[video_stream]->codecpar->height});
-    int size_probe_frames = 0; // frames spent still waiting for a usable size
-
-    AVPacket *packet = av_packet_alloc();
-    if (!packet)
-        return finish(2);
-
-    while (m_url == url) {
-        lock.unlock();
-        error = av_read_frame(format_context, packet);
-        lock.lock();
-        if (m_url != url)
-            break;
-        if (error < 0)
-            break;
-        if (packet->stream_index == video_stream) {
-            const int decode_error = decoder.decode(*packet);
-            if (decode_error == 0) {
-                if (!have_size) {
-                    have_size = apply_video_size(decoder.decoded_frame_size());
-                    if (!have_size) {
-                        av_packet_unref(packet);
-                        // MJPEG yields a sized frame on the first full packet; if
-                        // several seconds of frames never do, treat it as a bad
-                        // stream instead of sitting in "Loading..." forever.
-                        if (++size_probe_frames > 120)
-                            break;
-                        continue;
-                    }
-                }
-                auto frame_size = m_frame_size;
-                lock.unlock();
-#ifdef _WIN32
-                wxBitmap frame;
-                decoder.toWxBitmap(frame, frame_size);
-#else
-                wxImage frame;
-                decoder.toWxImage(frame, frame_size);
-#endif
-                lock.lock();
-                if (m_url != url)
-                    break;
-                if (frame.IsOk())
-                    m_frame = frame;
-                if (!m_refresh_pending.exchange(true)) {
-                    CallAfter([this] {
-                        m_refresh_pending.store(false);
-                        Refresh();
-                    });
-                }
-            }
-        }
-        av_packet_unref(packet);
-    }
-
-    av_packet_free(&packet);
-    return finish(m_url == url ? 2 : 1);
-}
-
 void wxMediaCtrl3::PlayThread()
 {
    using namespace std::chrono_literals;
@@ -471,22 +197,42 @@ void wxMediaCtrl3::PlayThread()
            continue;
        if (!url->HasScheme())
            break;
-        const wxString scheme = url->GetScheme();
-        const bool generic_ffmpeg = scheme.CmpNoCase("http") == 0 || scheme.CmpNoCase("https") == 0 ||
-                                    scheme.CmpNoCase("rtsp") == 0 || scheme.CmpNoCase("rtsps") == 0;
-        int error = 0;
-        if (generic_ffmpeg) {
-            error = PlayFfmpeg(url, lk);
-        } else {
-            lk.unlock();
-            Bambu_Tunnel tunnel = nullptr;
-            error = Bambu_Create(&tunnel, m_url->BuildURI().ToUTF8());
-            if (error == 0) {
-                Bambu_SetLogger(tunnel, &wxMediaCtrl3::bambu_log, this);
-                error = Bambu_Open(tunnel);
-                if (error == 0)
-                    error = Bambu_would_block;
+        lk.unlock();
+        Bambu_Tunnel tunnel = nullptr;
+        int error = Bambu_Create(&tunnel, m_url->BuildURI().ToUTF8());
+        if (error == 0) {
+            Bambu_SetLogger(tunnel, &wxMediaCtrl3::bambu_log, this);
+            error = Bambu_Open(tunnel);
+            if (error == 0)
+                error = Bambu_would_block;
+        }
+        lk.lock();
+        while (error == int(Bambu_would_block)) {
+            m_cond.wait_for(lk, 100ms);
+            if (m_url != url) {
+                error = 1;
+                break;
            }
+            lk.unlock();
+            error = Bambu_StartStream(tunnel, true);
+            lk.lock();
+        }
+        Bambu_StreamInfo info;
+        if (error == 0)
+            error = Bambu_GetStreamInfo(tunnel, 0, &info);
+        AVVideoDecoder decoder;
+        int minFrameDuration = 0;
+        if (error == 0) {
+            decoder.open(info);
+            m_video_size = { info.format.video.width, info.format.video.height };
+            adjust_frame_size(m_frame_size, m_video_size, GetSize());
+            minFrameDuration = 800 / info.format.video.frame_rate; // 80%
+            NotifyStopped();
+        }
+        Bambu_Sample sample;
+        while (error == 0) {
+            lk.unlock();
+            error = Bambu_ReadSample(tunnel, &sample);
            lk.lock();
            while (error == int(Bambu_would_block)) {
                m_cond.wait_for(lk, 100ms);
@@ -494,88 +240,60 @@ void wxMediaCtrl3::PlayThread()
                    error = 1;
                    break;
                }
-                lk.unlock();
-                error = Bambu_StartStream(tunnel, true);
-                lk.lock();
-            }
-            Bambu_StreamInfo info;
-            if (error == 0)
-                error = Bambu_GetStreamInfo(tunnel, 0, &info);
-            AVVideoDecoder decoder;
-            int minFrameDuration = 0;
-            if (error == 0) {
-                decoder.open(info);
-                m_video_size = { info.format.video.width, info.format.video.height };
-                adjust_frame_size(m_frame_size, m_video_size, GetSize());
-                minFrameDuration = 800 / info.format.video.frame_rate; // 80%
-                NotifyStopped();
-            }
-            Bambu_Sample sample;
-            while (error == 0) {
                lk.unlock();
                error = Bambu_ReadSample(tunnel, &sample);
                lk.lock();
-                while (error == int(Bambu_would_block)) {
-                    m_cond.wait_for(lk, 100ms);
-                    if (m_url != url) {
-                        error = 1;
-                        break;
-                    }
-                    lk.unlock();
-                    error = Bambu_ReadSample(tunnel, &sample);
-                    lk.lock();
-                }
-                if (error == 0) {
-                    auto frame_size = m_frame_size;
-                    lk.unlock();
-                    decoder.decode(sample);
-#ifdef _WIN32
-                    wxBitmap bm;
-                    decoder.toWxBitmap(bm, frame_size);
-#else
-                    wxImage bm;
-                    decoder.toWxImage(bm, frame_size);
-#endif
-                    lk.lock();
-                    if (m_url != url) {
-                        error = 1;
-                        break;
-                    }
-                    if (bm.IsOk()) {
-                        auto now = std::chrono::system_clock::now();
-                        if (m_last_PTS && (sample.decode_time - m_last_PTS) < 30000000ULL) { // 3s
-                            auto next_PTS_expected = m_last_PTS_expected + std::chrono::milliseconds((sample.decode_time - m_last_PTS) / 10000ULL);
-                            // The frame is late, catch up a little
-                            auto next_PTS_practical = m_last_PTS_practical + std::chrono::milliseconds(minFrameDuration);
-                            auto next_PTS = std::max(next_PTS_expected, next_PTS_practical);
-                            if(now < next_PTS)
-                                std::this_thread::sleep_until(next_PTS);
-                            else
-                                next_PTS = now;
-                            //auto text = wxString::Format(L"wxMediaCtrl3 pts diff %ld\n", std::chrono::duration_cast<std::chrono::milliseconds>(next_PTS - next_PTS_expected).count());
-                            //OutputDebugString(text);
-                            m_last_PTS = sample.decode_time;
-                            m_last_PTS_expected = next_PTS_expected;
-                            m_last_PTS_practical = next_PTS;
-                        } else {
-                            // Resync
-                            m_last_PTS           = sample.decode_time;
-                            m_last_PTS_expected  = now;
-                            m_last_PTS_practical = now;
-                        }
-                        m_frame = bm;
-                    }
-                    CallAfter([this] { Refresh(); });
-                }
            }
-            if (tunnel) {
+            if (error == 0) {
+                auto frame_size = m_frame_size;
                lk.unlock();
-                Bambu_Close(tunnel);
-                Bambu_Destroy(tunnel);
-                tunnel = nullptr;
+                decoder.decode(sample);
+#ifdef _WIN32
+                wxBitmap bm;
+                decoder.toWxBitmap(bm, frame_size);
+#else
+                wxImage bm;
+                decoder.toWxImage(bm, frame_size);
+#endif
                lk.lock();
+                if (m_url != url) {
+                    error = 1;
+                    break;
+                }
+                if (bm.IsOk()) {
+                    auto now = std::chrono::system_clock::now();
+                    if (m_last_PTS && (sample.decode_time - m_last_PTS) < 30000000ULL) { // 3s
+                        auto next_PTS_expected = m_last_PTS_expected + std::chrono::milliseconds((sample.decode_time - m_last_PTS) / 10000ULL);
+                        // The frame is late, catch up a little
+                        auto next_PTS_practical = m_last_PTS_practical + std::chrono::milliseconds(minFrameDuration);
+                        auto next_PTS = std::max(next_PTS_expected, next_PTS_practical);
+                        if(now < next_PTS)
+                            std::this_thread::sleep_until(next_PTS);
+                        else
+                            next_PTS = now;
+                        //auto text = wxString::Format(L"wxMediaCtrl3 pts diff %ld\n", std::chrono::duration_cast<std::chrono::milliseconds>(next_PTS - next_PTS_expected).count());
+                        //OutputDebugString(text);
+                        m_last_PTS = sample.decode_time;
+                        m_last_PTS_expected = next_PTS_expected;
+                        m_last_PTS_practical = next_PTS;
+                    } else {
+                        // Resync
+                        m_last_PTS           = sample.decode_time;
+                        m_last_PTS_expected  = now;
+                        m_last_PTS_practical = now;
+                    }
+                    m_frame = bm;
+                }
+                CallAfter([this] { Refresh(); });
            }
        }
+        if (tunnel) {
+            lk.unlock();
+            Bambu_Close(tunnel);
+            Bambu_Destroy(tunnel);
+            tunnel = nullptr;
+            lk.lock();
+        }
        if (m_url == url)
            m_error = error;
        m_frame_size = wxDefaultSize;
@@ -13,51 +13,41 @@
 #include "wx/bitmap.h"
 #include "wx/uri.h"
 #include "wx/mediactrl.h"
-#include "IMediaController.hpp"

 wxDECLARE_EVENT(EVT_MEDIA_CTRL_STAT, wxCommandEvent);

 void wxMediaCtrl_OnSize(wxWindow * ctrl, wxSize const & videoSize, int width, int height);

 #define BAMBU_DYNAMIC
-#include <atomic>
 #include <condition_variable>
 #include <thread>
+#ifndef _WIN32
 #include <wx/image.h>
+#endif
 #include "Printer/BambuTunnel.h"

 class AVVideoDecoder;

-class wxMediaCtrl3 : public wxWindow, public Slic3r::GUI::IMediaController, BambuLib
+class wxMediaCtrl3 : public wxWindow, BambuLib
 {
 public:
    wxMediaCtrl3(wxWindow *parent);

-    ~wxMediaCtrl3() override;
+    ~wxMediaCtrl3();

-    void Load(wxURI url) override;
+    void Load(wxURI url);

-    void Play() override;
+    void Play();

-    void Stop() override;
-
-    // Render frames supplied by a controller which owns its own transport.
-    // The frame is copied while m_mutex is held; callers may release it after
-    // this method returns.
-    void SetExternalFrame(const wxImage& frame, wxSize videoSize);
-#ifdef _WIN32
-    void SetExternalFrame(const wxBitmap& frame, wxSize videoSize);
-#endif
-    void BeginExternalStream();
-    void EndExternalStream();
+    void Stop();

    void SetIdleImage(wxString const & image);

-    wxMediaState GetState() override;
+    wxMediaState GetState();

-    int GetLastError() const override;
+    int GetLastError();

-    wxSize GetVideoSize() const override;
+    wxSize GetVideoSize();

 protected:
    DECLARE_EVENT_TABLE()
@@ -69,10 +59,8 @@ protected:
    void DoSetSize(int x, int y, int width, int height, int sizeFlags) override;

    static void bambu_log(void *ctx, int level, tchar const *msg);
-    static int ffmpeg_interrupt_callback(void *opaque);

    void PlayThread();
-    int PlayFfmpeg(std::shared_ptr<wxURI> const &url, std::unique_lock<std::mutex> &lock);

    void NotifyStopped();

@@ -89,15 +77,12 @@ private:
 #endif

    std::shared_ptr<wxURI> m_url;
-    std::shared_ptr<wxURI> m_active_url;
-    bool m_external = false;
    std::uint64_t m_last_PTS{0};
    std::chrono::system_clock::time_point m_last_PTS_expected;
    std::chrono::system_clock::time_point m_last_PTS_practical;
-    mutable std::mutex m_mutex;
+    std::mutex m_mutex;
    std::condition_variable m_cond;
    std::thread m_thread;
-    std::atomic_bool m_refresh_pending{false};
 };

 #endif /* wxMediaCtrl3_h */
@@ -1,568 +0,0 @@
-#include "AmsPayload.hpp"
-
-#include "Http.hpp"
-#include "libslic3r/Preset.hpp"
-#include "libslic3r/PresetBundle.hpp"
-#include "slic3r/GUI/GUI_App.hpp"
-#include "slic3r/GUI/DeviceManager.hpp"
-#include "slic3r/GUI/DeviceCore/DevFilaSystem.h"
-#include "slic3r/GUI/DeviceCore/DevManager.h"
-#include "slic3r/GUI/DeviceCore/DevStorage.h"
-#include "slic3r/GUI/DeviceCore/DevFirmware.h"
-
-#include <boost/algorithm/string.hpp>
-#include <boost/log/trivial.hpp>
-#include <wx/thread.h>
-
-#include <algorithm>
-#include <cctype>
-#include <chrono>
-#include <cstdint>
-#include <map>
-#include <mutex>
-#include <sstream>
-#include <utility>
-
-namespace Slic3r {
-
-std::string map_filament_type_to_generic_id(const std::string& filament_type)
-{
-    std::string upper = filament_type;
-    boost::trim(upper);
-    std::transform(upper.begin(), upper.end(), upper.begin(),
-                   [](unsigned char c) { return static_cast<char>(std::toupper(c)); });
-
-    // Normalize reported material names to an OrcaFilamentLibrary generic family. The
-    // family's filament_id is resolved from the loaded system presets below rather than
-    // hardcoded, so profile id re-mints never require touching this table.
-    // scripts/test_moonraker_lane_data.py parses this initializer; keep the {"A", "B"} format.
-    static const std::map<std::string, std::string> type_to_ofl_family = {
-        // PLA variants
-        {"PLA", "PLA"},
-        {"PLA-CF", "PLA-CF"},
-        {"PLA SILK", "PLA Silk"},
-        {"PLA-SILK", "PLA Silk"},
-        {"PLA HIGH SPEED", "PLA High Speed"},
-        {"PLA-HS", "PLA High Speed"},
-        {"PLA HS", "PLA High Speed"},
-
-        // ABS/ASA variants
-        {"ABS", "ABS"},
-        {"ASA", "ASA"},
-
-        // PETG/PET variants
-        {"PETG", "PETG"},
-        {"PET", "PETG"},
-        {"PCTG", "PCTG"},
-
-        // PA/Nylon variants
-        {"PA", "PA"},
-        {"NYLON", "PA"},
-        {"PA-CF", "PA-CF"},
-        {"PPA", "PPA-CF"},
-        {"PPA-CF", "PPA-CF"},
-        {"PPA-GF", "PPA-GF"},
-
-        // PC variants
-        {"PC", "PC"},
-
-        // PP/PE variants
-        {"PE", "PE"},
-        {"PP", "PP"},
-
-        // Support materials
-        {"PVA", "PVA"},
-        {"HIPS", "HIPS"},
-        {"BVOH", "BVOH"},
-
-        // TPU variants
-        {"TPU", "TPU"},
-
-        // Other materials
-        {"EVA", "EVA"},
-        {"PHA", "PHA"},
-        {"COPE", "CoPE"},
-        {"SBS", "SBS"},
-    };
-
-    auto it = type_to_ofl_family.find(upper);
-    if (it == type_to_ofl_family.end())
-        return UNKNOWN_FILAMENT_ID;
-
-    if (auto* bundle = GUI::wxGetApp().preset_bundle) {
-        const Preset* preset = bundle->filaments.find_preset("Generic " + it->second + " @System");
-        if (preset != nullptr && preset->is_system && !preset->filament_id.empty())
-            return preset->filament_id;
-    }
-
-    // Unknown material, or no loaded preset data to resolve against
-    return UNKNOWN_FILAMENT_ID;
-}
-
-std::string normalize_ams_color(const std::string& color)
-{
-    std::string value = color;
-    boost::trim(value);
-
-    // Remove 0x or 0X prefix if present
-    if (value.size() >= 2 && (value.rfind("0x", 0) == 0 || value.rfind("0X", 0) == 0)) {
-        value = value.substr(2);
-    }
-    // Remove # prefix if present
-    if (!value.empty() && value[0] == '#') {
-        value = value.substr(1);
-    }
-
-    // Extract only hex digits
-    std::string normalized;
-    for (char c : value) {
-        if (std::isxdigit(static_cast<unsigned char>(c))) {
-            normalized.push_back(static_cast<char>(std::toupper(static_cast<unsigned char>(c))));
-        }
-    }
-
-    // If 6 hex digits, add FF alpha
-    if (normalized.size() == 6) {
-        normalized += "FF";
-    }
-
-    // Validate length - return default if invalid
-    if (normalized.size() != 8) {
-        return "00000000";
-    }
-
-    return normalized;
-}
-
-bool parse_moonraker_lane_data(const nlohmann::json& body,
-                               std::vector<AmsTrayData>& trays,
-                               int& max_lane_index)
-{
-    // Expected structure: { "result": { "namespace": "lane_data", "value": { "lane1": {...}, ... } } }
-    if (!body.is_object() || !body.contains("result") || !body["result"].is_object() ||
-        !body["result"].contains("value") || !body["result"]["value"].is_object()) {
-        BOOST_LOG_TRIVIAL(warning) << "AmsPayload: unexpected lane_data response structure";
-        return false;
-    }
-
-    const auto& value = body["result"]["value"];
-    trays.clear();
-    max_lane_index = 0;
-
-    for (const auto& lane_item : value.items()) {
-        const auto& lane_obj = lane_item.value();
-        if (!lane_obj.is_object()) {
-            continue;
-        }
-
-        // Extract lane index from the "lane" field (tool number, 0-based)
-        int lane_index = -1;
-        const auto lane_it = lane_obj.find("lane");
-        if (lane_it != lane_obj.end() && lane_it->is_string()) {
-            try {
-                lane_index = std::stoi(lane_it->get<std::string>());
-            } catch (...) {
-                lane_index = -1;
-            }
-        }
-
-        if (lane_index < 0) {
-            continue;
-        }
-
-        AmsTrayData tray;
-        tray.slot_index = lane_index;
-        if (const auto it = lane_obj.find("color"); it != lane_obj.end() && it->is_string())
-            tray.tray_color = it->get<std::string>();
-        if (const auto it = lane_obj.find("material"); it != lane_obj.end() && it->is_string())
-            tray.tray_type = it->get<std::string>();
-        if (const auto it = lane_obj.find("bed_temp"); it != lane_obj.end() && it->is_number())
-            tray.bed_temp = it->get<int>();
-        if (const auto it = lane_obj.find("nozzle_temp"); it != lane_obj.end() && it->is_number())
-            tray.nozzle_temp = it->get<int>();
-
-        // Presence is independent of declared material: a physically loaded lane
-        // with no user-declared material must not read as empty. Prefer an
-        // explicit signal, fall back to the legacy "has a material type" rule.
-        const auto has_it = lane_obj.find("has_filament");
-        const auto loaded_it = lane_obj.find("loaded");
-        if (has_it != lane_obj.end() && has_it->is_boolean())
-            tray.has_filament = has_it->get<bool>();
-        else if (loaded_it != lane_obj.end() && loaded_it->is_boolean())
-            tray.has_filament = loaded_it->get<bool>();
-        else
-            tray.has_filament = !tray.tray_type.empty();
-
-        max_lane_index = std::max(max_lane_index, lane_index);
-        trays.push_back(tray);
-    }
-
-    if (trays.empty()) {
-        BOOST_LOG_TRIVIAL(info) << "AmsPayload: no lanes found";
-        return false;
-    }
-
-    return true;
-}
-
-LaneDataFetch read_moonraker_lane_data(const std::string& origin,
-                                       const std::string& api_key,
-                                       std::vector<AmsTrayData>& trays,
-                                       int& max_lane_index)
-{
-    trays.clear();
-    max_lane_index = 0;
-    std::string base = origin;
-    while (!base.empty() && base.back() == '/')
-        base.pop_back();
-    if (base.empty())
-        return LaneDataFetch::unknown;
-
-    unsigned    http_status = 0;
-    std::string response_body;
-    std::string http_error;
-    auto http = Http::get(base + "/server/database/item?namespace=lane_data");
-    if (!api_key.empty())
-        http.header("X-Api-Key", api_key);
-    http.timeout_connect(5)
-        .timeout_max(10)
-        .on_complete([&](std::string body, unsigned status) {
-            http_status = status;
-            if (status == 200)
-                response_body = std::move(body);
-            else
-                http_error = "HTTP error: " + std::to_string(status);
-        })
-        .on_error([&](std::string, std::string err, unsigned status) {
-            // Http routes every >=400 response through here, so a 404 arrives as
-            // a real HTTP status, not a transport failure (REQ-STS-007 §7.7).
-            http_status = status;
-            http_error  = err;
-            if (status > 0)
-                http_error += " (HTTP " + std::to_string(status) + ")";
-        })
-        .perform_sync();
-
-    if (http_status == 404) {
-        BOOST_LOG_TRIVIAL(info) << "AmsPayload: lane_data not served yet (unknown topology)";
-        return LaneDataFetch::unknown;
-    }
-    if (http_status != 200) {
-        BOOST_LOG_TRIVIAL(info) << "AmsPayload: lane_data fetch failed: " << http_error;
-        return LaneDataFetch::error;
-    }
-
-    auto json = nlohmann::json::parse(response_body, nullptr, false, true);
-    if (json.is_discarded()) {
-        BOOST_LOG_TRIVIAL(warning) << "AmsPayload: invalid lane_data JSON";
-        return LaneDataFetch::error;
-    }
-    const bool empty_value = json.is_object() && json.contains("result") && json["result"].is_object() &&
-                             json["result"].contains("value") && json["result"]["value"].is_object() &&
-                             json["result"]["value"].empty();
-    if (empty_value)
-        return LaneDataFetch::none;
-
-    if (!parse_moonraker_lane_data(json, trays, max_lane_index))
-        return LaneDataFetch::error;
-    return LaneDataFetch::synced;
-}
-
-void resolve_tray_info_idx(std::vector<AmsTrayData>& trays)
-{
-    auto* bundle = GUI::wxGetApp().preset_bundle;
-    for (auto& tray : trays) {
-        // Absent lanes render as placeholders; resolving an empty type is busy
-        // work at best and could bind a bogus id.
-        if (!tray.has_filament)
-            continue;
-        // A vendor-aware resolver may already have matched this lane; only fill
-        // what is still empty so the generic fallback cannot overwrite it.
-        if (!tray.tray_info_idx.empty())
-            continue;
-        tray.tray_info_idx = bundle
-            ? bundle->filaments.filament_id_by_type(tray.tray_type)
-            : map_filament_type_to_generic_id(tray.tray_type);
-    }
-}
-
-nlohmann::json build_bbl_ams_json(const std::vector<AmsTrayData>& trays,
-                                  int ams_count,
-                                  int max_lane_index)
-{
-    nlohmann::json ams_array = nlohmann::json::array();
-
-    // ams_exist_bits marks the units; tray_exist_bits marks the occupied
-    // slots. uint64_t: unsigned long is 32-bit on MSVC, so 1UL << 32+ is UB.
-    // BBL's fields are 64-bit; a lane past 63 cannot be represented at all.
-    uint64_t ams_exist_bits = 0;
-    uint64_t tray_exist_bits = 0;
-
-    auto set_exist_bit = [](uint64_t& bits, int index) {
-        if (index < 0)
-            return;
-        if (index >= 64) {
-            BOOST_LOG_TRIVIAL(warning) << "AmsPayload: lane index " << index << " exceeds the 64-bit exist-bits field; bit dropped";
-            return;
-        }
-        bits |= (uint64_t{1} << index);
-    };
-
-    for (int ams_id = 0; ams_id < ams_count; ++ams_id) {
-        set_exist_bit(ams_exist_bits, ams_id);
-
-        nlohmann::json ams_unit = nlohmann::json::object();
-        ams_unit["id"] = std::to_string(ams_id);
-        ams_unit["info"] = "0002";  // treat as AMS_LITE
-
-        nlohmann::json tray_array = nlohmann::json::array();
-        int max_slot_in_this_ams = std::min(3, max_lane_index - ams_id * 4);
-        for (int slot_id = 0; slot_id <= max_slot_in_this_ams; ++slot_id) {
-            int slot_index = ams_id * 4 + slot_id;
-
-            // Find tray with matching slot_index
-            const AmsTrayData* tray = nullptr;
-            for (const auto& t : trays) {
-                if (t.slot_index == slot_index) {
-                    tray = &t;
-                    break;
-                }
-            }
-
-            nlohmann::json tray_json = nlohmann::json::object();
-            tray_json["id"] = std::to_string(slot_id);
-            tray_json["tag_uid"] = "0000000000000000";
-
-            if (tray && tray->has_filament) {
-                set_exist_bit(tray_exist_bits, slot_index);
-
-                // Present lanes never carry tray_slot_placeholder: a loaded but
-                // undeclared lane stays occupied with an empty type, which is
-                // what distinguishes it from an absent slot.
-                tray_json["tray_info_idx"] = tray->tray_info_idx;
-                tray_json["tray_type"] = tray->tray_type;
-                tray_json["tray_color"] = normalize_ams_color(tray->tray_color);
-
-                // Add temperature data if provided
-                if (tray->bed_temp > 0) {
-                    tray_json["bed_temp"] = std::to_string(tray->bed_temp);
-                }
-                if (tray->nozzle_temp > 0) {
-                    tray_json["nozzle_temp_max"] = std::to_string(tray->nozzle_temp);
-                }
-            } else {
-                tray_json["tray_info_idx"] = "";
-                tray_json["tray_type"] = "";
-                tray_json["tray_color"] = "00000000";
-                tray_json["tray_slot_placeholder"] = "1";
-            }
-
-            tray_array.push_back(tray_json);
-        }
-        ams_unit["tray"] = tray_array;
-        ams_array.push_back(ams_unit);
-    }
-
-    // Format as hex strings (matching BBL protocol)
-    std::ostringstream ams_exist_ss;
-    ams_exist_ss << std::hex << std::uppercase << ams_exist_bits;
-    std::ostringstream tray_exist_ss;
-    tray_exist_ss << std::hex << std::uppercase << tray_exist_bits;
-
-    nlohmann::json ams_json = nlohmann::json::object();
-    ams_json["ams"] = ams_array;
-    ams_json["ams_exist_bits"] = ams_exist_ss.str();
-    ams_json["tray_exist_bits"] = tray_exist_ss.str();
-    return ams_json;
-}
-
-// --- Removal/absence state and op capability ---------------------------------
-
-// Last ams_count rendered per device: clear_ams_payload_for_device walks the
-// same unit set to mark them all absent.
-static std::mutex                         g_ams_state_mutex;
-static std::map<std::string, int>         g_ams_last_count;
-
-// One device's declaration from its get_capabilities reply. ops_known separates
-// "no reply yet" (never gate) from "answered without ops" (gate every write).
-struct AmsDeviceCaps
-{
-    std::vector<std::string> ops;
-    bool                     ops_known = false;
-    bool                     has_ams   = false;
-};
-static std::map<std::string, AmsDeviceCaps> g_ams_caps;
-
-static void remember_ams_count(const std::string& dev_id, int ams_count)
-{
-    if (dev_id.empty() || ams_count <= 0)
-        return;
-    std::lock_guard<std::mutex> lock(g_ams_state_mutex);
-    g_ams_last_count[dev_id] = std::max(g_ams_last_count[dev_id], ams_count);
-}
-
-void register_ams_ops(const std::string& dev_id, const std::vector<std::string>& ops)
-{
-    if (dev_id.empty())
-        return;
-    std::lock_guard<std::mutex> lock(g_ams_state_mutex);
-    AmsDeviceCaps& caps = g_ams_caps[dev_id];
-    caps.ops            = ops;
-    caps.ops_known      = true;
-}
-
-bool ams_op_supported(const std::string& dev_id, const std::string& op)
-{
-    std::lock_guard<std::mutex> lock(g_ams_state_mutex);
-    auto it = g_ams_caps.find(dev_id);
-    if (it == g_ams_caps.end() || !it->second.ops_known)
-        return true; // no capability reply yet: never gate
-    return std::find(it->second.ops.begin(), it->second.ops.end(), op) != it->second.ops.end();
-}
-
-void register_ams_capability(const std::string& dev_id, bool has_ams)
-{
-    if (dev_id.empty())
-        return;
-    std::lock_guard<std::mutex> lock(g_ams_state_mutex);
-    g_ams_caps[dev_id].has_ams = has_ams;
-}
-
-bool has_ams_capability(const std::string& dev_id)
-{
-    std::lock_guard<std::mutex> lock(g_ams_state_mutex);
-    auto it = g_ams_caps.find(dev_id);
-    return it != g_ams_caps.end() && it->second.has_ams;
-}
-
-void build_ams_payload_for_device(const std::string& dev_id,
-                                  const std::optional<std::string>& printer_type,
-                                  int ams_count,
-                                  int max_lane_index,
-                                  const std::vector<AmsTrayData>& trays,
-                                  const QueueOnMainFn& queue_fn,
-                                  const TrayInfoResolver& vendor_resolver)
-{
-    remember_ams_count(dev_id, ams_count);
-    // A caller on the GUI thread must mutate DeviceManager inline: invoking
-    // queue_fn (CallAfter) would defer the work until after the caller has
-    // already read DevFilaSystem. Background callers route through queue_fn.
-    const bool on_main = wxIsMainThread();
-    auto apply = [dev_id, printer_type, ams_count, max_lane_index, trays, vendor_resolver]() {
-    // Look up MachineObject via DeviceManager
-    auto* dev_manager = GUI::wxGetApp().getDeviceManager();
-    if (!dev_manager) {
-        return;
-    }
-    MachineObject* obj = dev_manager->get_my_machine(dev_id);
-    if (!obj) {
-        return;
-    }
-
-    // Resolve preset ids here: reads the GUI preset bundle, which is only safe
-    // on the main thread. trays is a copy, so mutating it is fine. The optional
-    // vendor resolver runs first; the generic resolver fills the rest.
-    std::vector<AmsTrayData> resolved = trays;
-    if (vendor_resolver)
-        vendor_resolver(resolved);
-    resolve_tray_info_idx(resolved);
-
-    // Wrap in the expected structure for ParseV1_0
-    nlohmann::json print_json = nlohmann::json::object();
-    print_json["ams"] = build_bbl_ams_json(resolved, ams_count, max_lane_index);
-
-    // Call the parser to populate DevFilaSystem
-    DevFilaSystemParser::ParseV1_0(print_json, obj, obj->GetFilaSystem().get(), false);
-    BOOST_LOG_TRIVIAL(info) << "AmsPayload: parsed " << resolved.size() << " trays";
-
-    // Set printer_type so update_sync_status() can match it against the preset's
-    // printer type. nullopt = leave it (the caller's push_status already carries
-    // it); a value = assign, including empty, preserving the old behavior.
-    if (printer_type.has_value()) {
-        obj->printer_type = *printer_type;
-    }
-
-    // Set push counters so is_info_ready() returns true for pull-mode agents.
-    if (obj->m_push_count == 0) {
-        obj->m_push_count = 1;
-    }
-    if (obj->m_full_msg_count == 0) {
-        obj->m_full_msg_count = 1;
-    }
-    obj->last_push_time = std::chrono::system_clock::now();
-
-    // Set storage state - Moonraker printers use virtual_sdcard, storage is always available.
-    // This is required for SelectMachineDialog to allow printing (otherwise it blocks with "No SD card").
-    obj->GetStorage()->set_sdcard_state(DevStorage::HAS_SDCARD_NORMAL);
-
-    // Populate module_vers so is_info_ready() passes the version check.
-    if (obj->module_vers.empty()) {
-        DevFirmwareVersionInfo ota_info;
-        ota_info.name = "ota";
-        ota_info.sw_ver = "1.0.0";  // Placeholder version
-        obj->module_vers.emplace("ota", ota_info);
-    }
-    };
-
-    if (queue_fn && !on_main) {
-        queue_fn(apply);
-    } else {
-        apply();
-    }
-}
-
-void clear_ams_payload_for_device(const std::string& dev_id, const QueueOnMainFn& queue_fn)
-{
-    int count = 0;
-    {
-        std::lock_guard<std::mutex> lock(g_ams_state_mutex);
-        auto it = g_ams_last_count.find(dev_id);
-        if (it != g_ams_last_count.end())
-            count = it->second;
-        g_ams_last_count[dev_id] = 0;
-    }
-    if (count == 0)
-        return; // nothing was ever rendered: nothing to clear
-
-    const bool on_main = wxIsMainThread();
-    auto apply = [dev_id, count]() {
-        auto* dev_manager = GUI::wxGetApp().getDeviceManager();
-        if (!dev_manager)
-            return;
-        MachineObject* obj = dev_manager->get_my_machine(dev_id);
-        if (!obj)
-            return;
-
-        // All units present-but-empty: exist bits 0 marks them absent while
-        // placeholder trays flush stale type/color data out of DevFilaSystem.
-        nlohmann::json units = nlohmann::json::array();
-        for (int ams_id = 0; ams_id < count; ++ams_id) {
-            nlohmann::json trays = nlohmann::json::array();
-            for (int slot_id = 0; slot_id < 4; ++slot_id) {
-                trays.push_back(nlohmann::json{
-                    {"id", std::to_string(slot_id)},
-                    {"tag_uid", "0000000000000000"},
-                    {"tray_info_idx", ""},
-                    {"tray_type", ""},
-                    {"tray_color", "00000000"},
-                    {"tray_slot_placeholder", "1"},
-                });
-            }
-            units.push_back(nlohmann::json{{"id", std::to_string(ams_id)}, {"info", "0002"}, {"tray", trays}});
-        }
-        nlohmann::json ams_json;
-        ams_json["ams"]                = units;
-        ams_json["ams_exist_bits"]     = "0";
-        ams_json["tray_exist_bits"]    = "0";
-        nlohmann::json print_json;
-        print_json["ams"] = ams_json;
-        DevFilaSystemParser::ParseV1_0(print_json, obj, obj->GetFilaSystem().get(), false);
-        BOOST_LOG_TRIVIAL(info) << "AmsPayload: cleared " << count << " AMS units for " << dev_id;
-    };
-    if (queue_fn && !on_main)
-        queue_fn(apply);
-    else
-        apply();
-}
-
-} // namespace Slic3r
@@ -1,114 +0,0 @@
-#ifndef __AMS_PAYLOAD_HPP__
-#define __AMS_PAYLOAD_HPP__
-
-#include "bambu_networking.hpp"
-
-#include <functional>
-#include <nlohmann/json.hpp>
-#include <optional>
-#include <string>
-#include <vector>
-
-namespace Slic3r {
-
-// One lane of a multi-material system in the neutral shape every printer agent
-// shares before it is rendered into the BBL AMS payload.
-struct AmsTrayData {
-    int         slot_index = 0;      // 0-based global slot index
-    bool        has_filament = false;
-    std::string tray_type;           // Material type (e.g. "PLA", "ASA")
-    std::string tray_color;          // Raw color (#RRGGBB, 0xRRGGBB, or RRGGBBAA)
-    std::string tray_info_idx;       // OrcaFilamentLibrary preset id (optional)
-    int         bed_temp = 0;        // Optional
-    int         nozzle_temp = 0;     // Optional
-};
-
-// Normalize a driver color string to the BBL RRGGBBAA form; "00000000" when invalid.
-std::string normalize_ams_color(const std::string& color);
-
-// Map a reported material type to an OrcaFilamentLibrary generic family id.
-std::string map_filament_type_to_generic_id(const std::string& filament_type);
-
-// Parse a Moonraker `/server/database/item?namespace=lane_data` response body:
-// result.value is keyed by lane, each entry carrying "lane", optional
-// "material"/"color"/"bed_temp"/"nozzle_temp" and an optional presence signal
-// ("has_filament" or "loaded"). Presence is preferred over material: a loaded
-// lane with no declared material must not read as empty. Returns false when
-// malformed or empty. Pure: tray_info_idx is left for resolve_tray_info_idx().
-bool parse_moonraker_lane_data(const nlohmann::json& body,
-                               std::vector<AmsTrayData>& trays,
-                               int& max_lane_index);
-
-// Outcome of one lane_data read. synced/none/unknown mirror OrcaSonar's
-// REQ-STS-007 tri-state; error covers transport failure and unparsable bodies.
-enum class LaneDataFetch { synced, none, unknown, error };
-
-// Read and parse the Moonraker `lane_data` namespace from origin (OrcaSonar's
-// façade or a real Moonraker — both emit the same shape). A non-empty api_key is
-// sent as X-Api-Key. trays/max_lane_index are only populated on synced. The
-// tri-state is preserved: 404 is unknown, an empty value object is none.
-LaneDataFetch read_moonraker_lane_data(const std::string& origin,
-                                       const std::string& api_key,
-                                       std::vector<AmsTrayData>& trays,
-                                       int& max_lane_index);
-
-// AMS units a flat lane range renders into (4 lanes per unit, rounding up);
-// 0 when there are no lanes. max_lane_index is the highest index, or -1.
-inline int ams_count_for_lanes(int max_lane_index)
-{
-    return max_lane_index < 0 ? 0 : (max_lane_index + 4) / 4;
-}
-
-// Fill each tray's tray_info_idx from the loaded preset bundle (falling back to
-// the generic family map). Reads GUI preset state, so it MUST run on the main
-// thread. Ids already set by a vendor-aware resolver are left untouched.
-void resolve_tray_info_idx(std::vector<AmsTrayData>& trays);
-
-// Optional vendor-aware resolver, run on the main thread before the generic
-// resolver. Agents with brand/color matching (Snapmaker, Creality) supply one
-// so their results survive the shared path; the generic resolver only fills
-// ids this leaves empty.
-using TrayInfoResolver = std::function<void(std::vector<AmsTrayData>&)>;
-
-// Assemble the BBL-format AMS JSON (ams[] units + ams_exist_bits/tray_exist_bits)
-// that DevFilaSystemParser::ParseV1_0 consumes. Pure and GUI-free: the
-// MachineObject mutation stays in build_ams_payload_for_device.
-nlohmann::json build_bbl_ams_json(const std::vector<AmsTrayData>& trays,
-                                  int ams_count,
-                                  int max_lane_index);
-
-// Render trays into the BBL AMS payload and populate the device's DevFilaSystem.
-// The resolver and the MachineObject mutation both run on the main thread via
-// queue_fn when set. printer_type: nullopt leaves obj->printer_type untouched
-// (OrcaSonar, whose push_status already carries it); a value assigns it
-// verbatim (Moonraker).
-void build_ams_payload_for_device(const std::string& dev_id,
-                                  const std::optional<std::string>& printer_type,
-                                  int ams_count,
-                                  int max_lane_index,
-                                  const std::vector<AmsTrayData>& trays,
-                                  const QueueOnMainFn& queue_fn,
-                                  const TrayInfoResolver& vendor_resolver = {});
-
-// Clear the device's AMS view: render every previously-seen unit as absent
-// with placeholder trays so a removed/absent material system never leaves
-// stale filament data behind (lane_data read as authoritative empty).
-void clear_ams_payload_for_device(const std::string& dev_id, const QueueOnMainFn& queue_fn);
-
-// Process-wide canonical AMS write capability (OrcaSonar REQ-STS-008), parsed
-// from the info.get_capabilities reply. A device with no record (no reply yet;
-// non-OrcaSonar agents never register) reports every op supported: gating only
-// applies to OrcaSonar printers that answered. An answer without ams_ops
-// registers an empty op set, so it gates every write.
-void   register_ams_ops(const std::string& dev_id, const std::vector<std::string>& ops);
-bool   ams_op_supported(const std::string& dev_id, const std::string& op);
-
-// Whether the device has a material system, from the get_capabilities reply's
-// protocol.features.fms (falling back to a non-empty ams_ops). No record reads
-// false: an unconfirmed printer must not advertise filament sync.
-void   register_ams_capability(const std::string& dev_id, bool has_ams);
-bool   has_ams_capability(const std::string& dev_id);
-
-} // namespace Slic3r
-
-#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hanif Koh	02b8e26a4f	Move the Cube with the Wipe Tower in the Profile Validator The slice check centres its cube on the bed, puts the prime tower beside it, then pulls the tower alone inside the printable outline. On a bed too narrow for the estimated footprint that pull drags the tower back over the cube: Volumic EXO42 IDRE MIRROR MODE (189 mm wide, 87.6 mm estimate) logged "gcode path conflicts found between WipeTower and cube" in every run, and three ~105 mm beds were left with 0.15 to 3.3 mm of clearance. The cube and the tower's footprint are now pulled inside as one rigid pair, so the clearance between them is fixed by construction. A bed too small for the pair keeps the old placement, and presets that were never clamped keep their exact layout.	2026-09-21 18:45:16 +08:00
barmanr	64cad00569	fix: update OrcaArena product URL (#15796 ) Merged by /bot merge on behalf of @barmanr (id 281100727). Grants: resources/profiles/OrcaArena, resources/profiles/OrcaArena.json Head: `794db5d30d`	2026-09-21 09:53:13 +00:00
SoftFever	45940a573d	Grant pull-requests write so profile PR labels and the partner notice actually post	2026-09-21 17:13:44 +08:00
HanifKoh	8b63628cf9	Restore Plugin HTML After a WebKit Reload (#15737 ) Plugin dialog content is injected with SetPage, so on the WebKit backends a reload (context menu, keyboard shortcut or location.reload()) re-fetches the SetPage base URL instead of the injected document, and the plugin UI is gone for good: load_plugin_content() returned early once m_content_loaded was set. Re-inject the plugin HTML when a main-frame load after the initial swap is neither that swap nor a page the plugin linked to. m_own_page_load marks the load our own SetPage caused, and the URL test recognises the reload: the injected document and the directory a reload re-fetches both report the base URL, so a load of any other URL is left alone. The test ignores a fragment the page navigated to, and undoes the escaping the web view applies to what the resources path holds. A load reaching the base URL is not enough on its own, because WebKitGTK reports a navigation that never committed against the document that stayed and then finishes that document again: a link to a missing file therefore arrives as a load of the base URL and reads exactly like a reload. So the re-injection also requires a navigation to the base URL to have committed, which a reload always does and a failure never does. A bootstrap page that cannot be loaded is still not recovered from: WebKitGTK substitutes a stock error page for it, and that load supersedes the swap whichever way the swap is ordered around it. The file ships, so this is a broken-install path; nothing here makes it worse than it already was. No separate MSW path is needed: wxWebViewEdge ignores the SetPage base URL, so its documents report about:blank and the test never matches there, and WebView2 reloads NavigateToString content from its own history entry anyway.	2026-09-21 17:09:05 +08:00
dremc	c8bfd2ad3e	Fix instantiation on DREMC Filament (#14659 )	2026-09-21 16:53:16 +08:00
Alexander Haibl	3eae4c6997	fix-start-gcode for many creality printers (#14652 )	2026-09-21 16:22:32 +08:00
gyarros	83eaf3bcfc	FilAr PLA-mate: lower bed temperature to 50 C (#14489 )	2026-09-21 16:07:49 +08:00
Davide Garberi	454ef1571b	Update generic filament profiles for Creality SPARKX i7 (#14388 )	2026-09-21 16:01:14 +08:00