some misc changes (#1848)

* some misc changes * stealth_mode: disable hms * fix bbl camera #1091 #1830 * fix anker
SoftFever · Aug 20, 2023 · 6e1bdaf · 6e1bdaf
1 parent a202fde
commit 6e1bdaf
Show file tree

Hide file tree

Showing 49 changed files with 366 additions and 302 deletions.
diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml
@@ -15,18 +15,22 @@ on:
       - 'deps/**'
       - .github/workflows/build_deps.yml
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_deps:
     strategy:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
-          - os: windows-2019
-          - os: macos-12
-            arch: x86_64
-          - os: macos-12
-            arch: arm64
+          # - os: ubuntu-22.04
+          - os: windows-latest
+          # - os: macos-12
+          #   arch: x86_64
+          # - os: macos-12
+          #   arch: arm64
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -35,31 +39,29 @@ jobs:
 
       - name: setup dev on Windows
         if: matrix.os == 'Windows'
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: microsoft/setup-msbuild@v1.1
 
       - name: Get the date on Ubuntu and macOS
-        if: matrix.os != 'windows-2019'
+        if: matrix.os != 'windows-latest'
         id: get-date-unix
         run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
 
       - name: Get the date on Windows
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-latest'
         id: get-date-windows
         run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
         shell: pwsh
 
       - name: Build on Windows
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
         run: |
             choco install strawberryperl
             mkdir ${{ github.workspace }}/deps/build
             mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
-            .\build_release.bat deps
+            .\build_release_vs2022.bat deps
             cd ${{ github.workspace }}/deps/build
-            '"C:/Program Files/7-Zip/7z.exe" a OrcaSlicer_dep_win64_${{ env.date }}.zip ${{ github.workspace }}/deps/build/OrcaSlicer_dep'
-            ls
 
       - name: Build on Mac x86_64
         if: matrix.os == 'macos-12' && matrix.arch == 'x86_64'
@@ -110,11 +112,11 @@ jobs:
           path: ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep*.tar.gz
 
       - name: Upload Windows artifacts
-        if: matrix.os == 'windows-2019'
+        if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v3
         with:
           name: OrcaSlicer_dep_win64_${{ env.date }}
-          path: ${{ github.workspace }}/deps/build/*.zip
+          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
 
       - name: Upload Ubuntu artifacts
         if: matrix.os == 'ubuntu-22.04'

diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml
@@ -22,7 +22,11 @@ on:
        - 'localization/**'
        - 'resources/**'
        - ".github/workflows/build_orca.yml"
-
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_orca:
     strategy:
@@ -146,12 +150,12 @@ jobs:
 # Windows
       - name: setup MSVC
         if: matrix.os == 'windows-2019'
-        uses: ilammy/msvc-dev-cmd@v1
+        uses: microsoft/setup-msbuild@v1.1
 
-      - name: Install perl
+      - name: Install nsis
         if: matrix.os == 'windows-2019'
         run: |
-          choco install strawberryperl
+          choco install nsis
 
       - name: download deps
         if: matrix.os == 'windows-2019'
@@ -185,7 +189,7 @@ jobs:
       #   name: build deps
       #   working-directory: ${{ github.workspace }}
       #   continue-on-error: true
-      #   run: .\build_release.bat deps
+      #   run: .\build_release_vs2022.bat deps
 
       # - run:  Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
 
@@ -194,19 +198,30 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: .\build_release.bat slicer
 
+      - name: Create installer Win
+        if: matrix.os == 'windows-2019'
+        working-directory: ${{ github.workspace }}/build
+        run: cpack -G NSIS
+
       # - name: pack app
         # if: matrix.os == 'windows-2019'
         #   working-directory: ${{ github.workspace }}/build
       #   shell: cmd
       #   run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer'
 
-      - name: Upload artifacts Win
+      - name: Upload artifacts Win zip
         if: matrix.os == 'windows-2019'
         uses: actions/upload-artifact@v3
         with:
-          name: OrcaSlicer_Windows_V${{ env.ver }}
+          name: OrcaSlicer_Windows_V${{ env.ver }}_portable
           path: ${{ github.workspace }}/build/OrcaSlicer
 
+      - name: Upload artifacts Win installer
+        if: matrix.os == 'windows-2019'
+        uses: actions/upload-artifact@v3
+        with:
+          name: OrcaSlicer_Windows_V${{ env.ver }}
+          path: ${{ github.workspace }}/build/OrcaSlicer*.exe
 # Ubuntu
 
       - name: Install dependencies

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,6 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
 
 set(IS_CROSS_COMPILE FALSE)
 
-
 if (APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)
     set(CMAKE_FIND_APPBUNDLE LAST)
@@ -713,7 +712,10 @@ endif()
 
 # Resources install target, configure fhs.hpp on UNIX
 if (WIN32)
-    install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
+    install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "./resources")
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
+    include(InstallRequiredSystemLibraries) 
+    install (PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ".")
 elseif (SLIC3R_FHS)
     # CMAKE_INSTALL_FULL_DATAROOTDIR: read-only architecture-independent data root (share)
     set(SLIC3R_FHS_RESOURCES "${CMAKE_INSTALL_FULL_DATAROOTDIR}/OrcaSlicer")
@@ -733,4 +735,34 @@ else ()
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
 
+install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION ".")
 configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)
+
+set (CPACK_PACKAGE_NAME "OrcaSlicer")
+set (CPACK_PACKAGE_VENDOR "SoftFever")
+set (CPACK_PACKAGE_VERSION_MAJOR "${ORCA_VERSION_MAJOR}")
+set (CPACK_PACKAGE_VERSION_MINOR "${ORCA_VERSION_MINOR}")
+set (CPACK_PACKAGE_VERSION_PATCH "${ORCA_VERSION_PATCH}")
+set (CPACK_PACKAGE_FILE_NAME "OrcaSlicer_Windows_${SoftFever_VERSION}")
+set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Orca Slicer is an open source slicer for FDM printers")
+set (CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/SoftFever/OrcaSlicer")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/resources/images\\\\OrcaSlicer.ico")
+set (CPACK_NSIS_MUI_ICON "${CPACK_PACKAGE_ICON}")
+set (CPACK_NSIS_MUI_UNIICON "${CPACK_PACKAGE_ICON}")
+set (CPACK_NSIS_INSTALLED_ICON_NAME  "$INSTDIR\\\\orca-slicer.exe")
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+    CreateShortCut \\\"$DESKTOP\\\\OrcaSlicer.lnk\\\" \\\"$INSTDIR\\\\orca-slicer.exe\\\"
+")
+set (CPACK_PACKAGE_CHECKSUM SHA256)
+set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OrcaSlicer")
+set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
+set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
+# set (CPACK_NSIS_MODIFY_PATH "ON")
+set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer")
+set(CPACK_CREATE_DESKTOP_LINKS "orca-slicer")
+set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command
+
+set(CPACK_WIX_UPGRADE_GUID "058245e8-20e0-4a95-9ab7-1acfe17ad511")
+set(CPACK_GENERATOR NSIS)
+include(CPack)
diff --git a/LICENSE → LICENSE.txt b/LICENSE → LICENSE.txt
diff --git a/resources/config.json b/resources/config.json
@@ -1,80 +1,83 @@
 {
     "printers": [
-        {
-            "display_name": "Bambu Lab P1P",
-            "func": {
-                "FUNC_CHAMBER_TEMP": false,
-                "FUNC_FIRSTLAYER_INSPECT": false,
-                "FUNC_AI_MONITORING": false,
-                "FUNC_BUILDPLATE_MARKER_DETECT": false,
-                "FUNC_FLOW_CALIBRATION": false,
-                "FUNC_MONITORING": false,
-                "FUNC_MEDIA_FILE": false,
-                "FUNC_REMOTE_TUNNEL": false,
-                "FUNC_LOCAL_TUNNEL": true,
-                "FUNC_VIRTUAL_CAMERA" : false,
-                "FUNC_PRINT_WITHOUT_SD": false,
-                "FUNC_ALTER_RESOLUTION": false,
-                "FUNC_CHAMBER_FAN" : false,
-                "FUNC_EXTRUSION_CALI": true,
-                "FUNC_PRINT_ALL" : false
-            },
-            "camera_resolution":["720p"],
-            "bed_temperature_limit": 100,
-            "model_id": "C11",
-            "printer_type": "C11",
-            "ftp_folder" : "sdcard/",
-            "printer_thumbnail_image": "printer_thumbnail_p1p"
+      {
+        "display_name": "Bambu Lab P1P",
+        "func": {
+          "FUNC_CHAMBER_TEMP": false,
+          "FUNC_FIRSTLAYER_INSPECT": false,
+          "FUNC_AI_MONITORING": true,
+          "FUNC_LIDAR_CALIBRATION": false,
+          "FUNC_BUILDPLATE_MARKER_DETECT": false,
+          "FUNC_FLOW_CALIBRATION": false,
+          "FUNC_MONITORING": false,
+          "FUNC_MEDIA_FILE": false,
+          "FUNC_VIRTUAL_CAMERA": false,
+          "FUNC_PRINT_WITHOUT_SD": false,
+          "FUNC_ALTER_RESOLUTION": false,
+
+          "FUNC_PRINT_ALL": false,
+          "FUNC_EXTRUSION_CALI": true
         },
-	{
-            "display_name": "Bambu Lab P1S",
-            "func": {
-              "FUNC_CHAMBER_TEMP": false,
-              "FUNC_FIRSTLAYER_INSPECT": false,
-              "FUNC_AI_MONITORING": true,
-              "FUNC_LIDAR_CALIBRATION": false,
-              "FUNC_BUILDPLATE_MARKER_DETECT": false,
-              "FUNC_FLOW_CALIBRATION": false,
-              "FUNC_MONITORING": false,
-              "FUNC_MEDIA_FILE": false,
-              "FUNC_VIRTUAL_CAMERA": false,
-              "FUNC_PRINT_WITHOUT_SD": false,
-              "FUNC_ALTER_RESOLUTION": false,
-              "FUNC_PRINT_ALL": false,
-              "FUNC_VIRTUAL_TYAY": true,
-              "FUNC_EXTRUSION_CALI": true
-            },
-            "camera_resolution": [ "720p" ],
-            "bed_temperature_limit": 100,
-            "model_id": "C12",
-            "compatible_machine":["BL-P001", "BL-P002", "C11"],
-            "printer_type": "C12",
-            "ftp_folder" : "sdcard/",
-            "printer_thumbnail_image": "printer_thumbnail_p1p"
+        "camera_resolution": [ "720p" ],
+        "bed_temperature_limit": 100,
+        "model_id": "C11",
+        "printer_type": "C11",
+        "compatible_machine": [ "BL-P001", "BL-P002", "C12"],
+        "ftp_folder": "sdcard/",
+        "printer_thumbnail_image": "printer_thumbnail_p1p"
+      },
+ {
+        "display_name": "Bambu Lab P1S",
+        "func": {
+          "FUNC_CHAMBER_TEMP": false,
+          "FUNC_FIRSTLAYER_INSPECT": false,
+          "FUNC_AI_MONITORING": true,
+          "FUNC_LIDAR_CALIBRATION": false,
+          "FUNC_BUILDPLATE_MARKER_DETECT": false,
+          "FUNC_FLOW_CALIBRATION": false,
+          "FUNC_MONITORING": false,
+          "FUNC_MEDIA_FILE": false,
+          "FUNC_VIRTUAL_CAMERA": false,
+          "FUNC_PRINT_WITHOUT_SD": false,
+          "FUNC_ALTER_RESOLUTION": false,
+          "FUNC_PRINT_ALL": false,
+          "FUNC_VIRTUAL_TYAY": true,
+          "FUNC_EXTRUSION_CALI": true
         },
-	{
-            "display_name": "Bambu Lab X1",
-            "func": {
-                "FUNC_VIRTUAL_TYAY" : true,
-                "FUNC_EXTRUSION_CALI": false,
-                "FUNC_LOCAL_TUNNEL": false
-            },
-            "model_id": "BL-P002",
-            "camera_resolution":["720p","1080p"],
-            "printer_type": "3DPrinter-X1",
-            "printer_thumbnail_image": "printer_thumbnail"
+        "camera_resolution": [ "720p" ],
+        "bed_temperature_limit": 100,
+        "model_id": "C12",
+        "compatible_machine":["BL-P001", "BL-P002", "C11"],
+        "printer_type": "C12",
+        "ftp_folder" : "sdcard/",
+        "printer_thumbnail_image": "printer_thumbnail_p1p"
+      },
+      {
+
+        "display_name": "Bambu Lab X1",
+        "func": {
+          "FUNC_VIRTUAL_TYAY": true,
+          "FUNC_EXTRUSION_CALI": false,
+          "FUNC_LOCAL_TUNNEL": false
         },
-        {
-            "display_name": "Bambu Lab X1 Carbon",
-            "func": {
-                "FUNC_VIRTUAL_TYAY" : true,
-                "FUNC_EXTRUSION_CALI": false,
-                "FUNC_LOCAL_TUNNEL": false
-            },
-            "model_id": "BL-P001",
-            "camera_resolution":["720p","1080p"],
-            "printer_type": "3DPrinter-X1-Carbon",
-            "printer_thumbnail_image": "printer_thumbnail"
-        }
+        "model_id": "BL-P002",
+        "compatible_machine": [ "BL-P001", "C11", "C12"],
+        "camera_resolution": [ "720p", "1080p" ],
+        "printer_type": "3DPrinter-X1",
+        "printer_thumbnail_image": "printer_thumbnail"
+      },
+      {
+        "display_name": "Bambu Lab X1 Carbon",
+        "func": {
+          "FUNC_VIRTUAL_TYAY": true,
+          "FUNC_EXTRUSION_CALI": false,
+          "FUNC_LOCAL_TUNNEL": false
+        },
+        "model_id": "BL-P001",
+        "compatible_machine": [ "BL-P002", "C11", "C12"],
+        "camera_resolution": [ "720p", "1080p" ],
+        "printer_type": "3DPrinter-X1-Carbon",
+        "printer_thumbnail_image": "printer_thumbnail"
+      }
     ]
 }
diff --git a/resources/profiles/Anker/machine/fdm_machine_common.json b/resources/profiles/Anker/machine/fdm_machine_common.json
@@ -110,7 +110,7 @@
     ],
     "silent_mode": "0",
     "single_extruder_multi_material": "1",
-    "use_relative_e_distances": "0",
+    "use_relative_e_distances": "1",
     "wipe_distance": [
         "0"
     ],

diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json
@@ -1,6 +1,6 @@
 {
     "name": "Qidi",
-    "version": "01.06.05.00",
+    "version": "01.06.05.01",
     "force_update": "0",
     "description": "Qidi configurations",
     "machine_model_list": [

diff --git a/resources/profiles/Qidi/filament/Qidi Generic ABS.json b/resources/profiles/Qidi/filament/Qidi Generic ABS.json
@@ -10,12 +10,12 @@
         "0.926"
     ],
     "filament_max_volumetric_speed": [
-        "12"
+        "15"
     ],
 	"compatible_printers": [
-	"Qidi X-Plus 0.4 nozzle",
-	"Qidi X-Max 0.4 nozzle",
-	"Qidi X-CF Pro 0.4 nozzle",
+        "Qidi X-Plus 0.4 nozzle",
+        "Qidi X-Max 0.4 nozzle",
+        "Qidi X-CF Pro 0.4 nozzle",
 		"Qidi X-Smart 3 0.4 nozzle",
 		"Qidi X-Plus 3 0.4 nozzle",
 		"Qidi X-Max 3 0.4 nozzle"