Merge branch 'release-0915' into HEAD

Author: hemiao2023

BuildLinux_clang.sh

@@ -166,7 +166,8 @@ then
     then
         BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DBBL_INTERNAL_TESTING=1"
     else
-        BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0 -DUPDATE_ONLINE_MACHINES=1"
+        #BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0 -DUPDATE_ONLINE_MACHINES=1"
+        BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBBL_RELEASE_TO_PUBLIC=1 -DBBL_INTERNAL_TESTING=0 -DUPDATE_ONLINE_MACHINES=1"
     fi
     echo -e "cmake -S . -B build -G Ninja -DCMAKE_PREFIX_PATH="${DPS_PATH}/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}"
     cmake -S . -B build -G Ninja \

CMakeLists.txt

@@ -766,6 +766,7 @@ function(crealityprint_copy_dlls target config postfix output_dlls)
             ${CMAKE_PREFIX_PATH}/bin/occt/TKXDESTEP.dll
             ${CMAKE_PREFIX_PATH}/bin/occt/TKXSBase.dll
             ${CMAKE_PREFIX_PATH}/bin/freetype.dll
+            ${CMAKE_PREFIX_PATH}/bin/cr_tpms_library.dll
          DESTINATION ${_out_dir})
     set(FFMPEG_LIBRARIES_OUTPUT_LIBS "")
     find_package(FFmpeg)
@@ -835,6 +836,7 @@ function(crealityprint_copy_dlls target config postfix output_dlls)
         )
     endif()
     set(${output_dlls}
+	    ${_out_dir}/cr_tpms_library.dll
         ${_out_dir}/libgmp-10.dll
         ${_out_dir}/libmpfr-4.dll
         ${_out_dir}/WebView2Loader.dll

CMakePresets.json

@@ -114,7 +114,8 @@
                 "CMAKE_CXX_COMPILER": "/usr/bin/clang++",
                 "CMAKE_C_COMPILER": "/usr/bin/clang",
                 "CMAKE_C_COMPILER_LAUNCHER": "ccache",
-                "CMAKE_CXX_COMPILER_LAUNCHER": "ccache"
+                "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
+                "SLIC3R_STATIC":"1"
             }
         },
         {

cmake/modules/NSIS.template.in

@@ -1023,6 +1023,9 @@ Jump_Del_Thumb:
   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
 
   ;Remove the installation directory if it is empty.
+  ; 清理安装目录下可能存在的 log 文件夹
+  RMDir /r "$INSTDIR\log"
+  
   RMDir "$INSTDIR"
     ; 判断上级目录是否为 Creality
   GetFullPathName $R0 "$INSTDIR\.."

deps/CMakeLists.txt

@@ -290,6 +290,7 @@ include(OpenVDB/OpenVDB.cmake)
 
 include(GMP/GMP.cmake)
 include(MPFR/MPFR.cmake)
+include(CR_TPMS/cr_tpms.cmake)
 include(CGAL/CGAL.cmake)
 
 include(NLopt/NLopt.cmake)
@@ -356,7 +357,7 @@ endif ()
 
 
 include(FFmpeg/ffmpeg.cmake)
-
+include(paho-mqtt/paho-mqtt.cmake)
 include(OCCT/OCCT.cmake)
 include(OpenCV/OpenCV.cmake)
 include(aliyun-oss-cpp-sdk/aliyun-oss-cpp-sdk.cmake)
@@ -391,6 +392,8 @@ if(ENABLE_BREAKPAD)
         dep_BREAKPAD
         dep_Assimp
         dep_FFmpeg
+        dep_MQTTC
+        dep_MQTT
         )
 else()
     message(STATUS "Breakpad is disabled...")
@@ -414,6 +417,8 @@ else()
         ${EXPAT_PKG}
         dep_OSS
         dep_Assimp
+        dep_MQTTC
+        dep_MQTT
         )
 endif()
 
@@ -423,8 +428,10 @@ endif()
 if (MSVC)
     # Experimental
     #list(APPEND _dep_list "dep_qhull")
+	list(APPEND _dep_cr_tpms "dep_CR_TPMS")
 else()
     list(APPEND _dep_list "dep_Qhull")
+    list(APPEND _dep_cr_tpms "dep_CR_TPMS")
     # list(APPEND _dep_list "dep_x264")   #mac need build x264
     # Not working, static build has different Eigen
     #list(APPEND _dep_list "dep_libigl")
@@ -433,7 +440,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     include(ZSTD/ZSTD.cmake)
     list(APPEND _dep_list_first "dep_zstd")
 endif()
-add_custom_target(deps ALL DEPENDS ${_dep_list_first} ${_dep_list} )
+add_custom_target(deps ALL DEPENDS ${_dep_list_first} ${_dep_list} ${_dep_cr_tpms}  )
 
 # Note: I'm not using any of the LOG_xxx options in ExternalProject_Add() commands
 # because they seem to generate bogus build files (possibly a bug in ExternalProject).

deps/CR_TPMS/cr_tpms.cmake

@@ -0,0 +1,42 @@
+set(_srcdir ${CMAKE_CURRENT_LIST_DIR}/cr_tpms)
+
+if (MSVC)
+    set(_output  ${DESTDIR}/include/cr_tpms_library.h
+                 ${DESTDIR}/lib/cr_tpms_library.lib
+                 ${DESTDIR}/bin/cr_tpms_library.dll)
+
+    add_custom_command(
+        OUTPUT  ${_output}
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/cr_tpms_library.h ${DESTDIR}/include/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/cr_tpms_library.lib ${DESTDIR}/lib/
+        COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/win${DEPS_BITS}/cr_tpms_library.dll ${DESTDIR}/bin/
+    )
+
+    add_custom_target(dep_CR_TPMS SOURCES ${_output})
+
+elseif(APPLE)
+    set(_output  ${DESTDIR}/include/cr_tpms_library.h
+    ${DESTDIR}/lib/libcr_tpms_library.a)
+
+    add_custom_command(
+    OUTPUT  ${_output}
+    COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/cr_tpms_library.h ${DESTDIR}/include/
+    COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/mac/${CMAKE_SYSTEM_PROCESSOR}/libcr_tpms_library.a ${DESTDIR}/lib/
+    )
+    add_custom_target(dep_CR_TPMS SOURCES ${_output})
+    message(STATUS "CR_TPMS Mac _output: ${_srcdir}/lib/mac/${CMAKE_SYSTEM_PROCESSOR}/libcr_tpms_library.a")
+    message(STATUS "${DESTDIR}/lib/libcr_tpms_library.a")
+elseif(UNIX)
+    set(_output  ${DESTDIR}/include/cr_tpms_library.h
+    ${DESTDIR}/lib/libcr_tpms_library.a)
+
+    add_custom_command(
+    OUTPUT  ${_output}
+    COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/include/cr_tpms_library.h ${DESTDIR}/include/
+    COMMAND ${CMAKE_COMMAND} -E copy ${_srcdir}/lib/linux/${CMAKE_SYSTEM_PROCESSOR}/libcr_tpms_library.a ${DESTDIR}/lib/
+    )
+
+    add_custom_target(dep_CR_TPMS SOURCES ${_output})
+    message(STATUS "CR_TPMS Linux _output: ${CMAKE_SYSTEM_PROCESSOR}")
+endif ()
+

deps/CR_TPMS/cr_tpms/include/cr_tpms_library.h

@@ -0,0 +1,29 @@
+#ifndef CR_TPMS_LIBRARY_H
+#define CR_TPMS_LIBRARY_H
+
+#ifdef _WIN32
+    #ifdef CR_TPMS_LIBRARY_EXPORTS
+        #define CR_TPMS_API __declspec(dllexport)
+    #else
+        #define CR_TPMS_API __declspec(dllimport)
+    #endif
+#else
+    #define CR_TPMS_API __attribute__((visibility("default")))
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// 主标量场函数
+CR_TPMS_API float scalar_function_test(float x, float y, float z,
+                                     float bbox_min_x, float bbox_min_y, float bbox_min_z,
+                                     float bbox_max_x, float bbox_max_y, float bbox_max_z,
+                                     int axis, int celltype,
+                                     float infill_density1, float infill_density2);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CR_TPMS_LIBRARY_H