update version to v1.10.18

orbbec · Jan 4, 2025 · 1d71bc8 · 1d71bc8
1 parent 6fc3334
commit 1d71bc8
Show file tree

Hide file tree

Showing 23 changed files with 37 additions and 10 deletions.
diff --git a/include/libobsensor/h/ObTypes.h b/include/libobsensor/h/ObTypes.h
@@ -802,6 +802,20 @@ typedef struct {
     int32_t lower;  ///< Lower threshold, unit: ms
 } OBTofExposureThresholdControl, ob_tof_exposure_threshold_control, TOF_EXPOSURE_THRESHOLD_CONTROL;
 
+/**
+ * @brief Device depth industry mode
+ */
+typedef enum {
+    OB_INDUSTRY_DEFAULT,
+    OB_INDUSTRY_MODE1,
+    OB_INDUSTRY_MODE2,
+    OB_INDUSTRY_MODE3,
+    OB_INDUSTRY_MODE4,
+    OB_INDUSTRY_MODE5,
+} OBDepthIndustryMode,
+    ob_depth_industry_mode;
+
+
 /**
  * @brief Sync mode
  * @deprecated This define is deprecated, please use @ref ob_multi_device_sync_mode instead
@@ -1204,6 +1218,12 @@ typedef enum {
      * @attention In this mode, the user may return null when getting the specified type of data frame from the acquired FrameSet
      */
     OB_FRAME_AGGREGATE_OUTPUT_ANY_SITUATION,
+    /**
+     * @brief Disable Frame Aggreate
+     *
+     * @attention In this mode, All types of data frames will output independently.
+     */
+    OB_FRAME_AGGREGATE_OUTPUT_DISABLE,
 } OB_FRAME_AGGREGATE_OUTPUT_MODE,
     OBFrameAggregateOutputMode, ob_frame_aggregate_output_mode;
 

diff --git a/include/libobsensor/h/Property.h b/include/libobsensor/h/Property.h
@@ -384,10 +384,6 @@ typedef enum {
      * @brief Query the status of laser pulse width protection (read-only)
      */
     OB_PROP_LASER_PULSE_WIDTH_PROTECTION_STATUS_BOOL = 149,
-    /**
-     * @brief depth noise removal filter
-     */
-    OB_PROP_DEPTH_NOISE_REMOVAL_FILTER_BOOL = 165,
 
     /**
      * @brief Laser always on, true: always on, false: off, laser will be turned off when out of exposure time
@@ -726,6 +722,16 @@ typedef enum {
      */
     OB_PROP_SDK_DEPTH_RECTIFY_MG_FILTER_BOOL = 3013,
 
+    /**
+     * @brief Depth Stream Industry Working Mode Settings, currently only supported by DCW2.
+     */
+    OB_PROP_DEPTH_INDUSTRY_MODE_INT = 3024,
+
+    /**
+     * @brief "OpenNI device setting data stream packet size, such as DCW2.
+     */
+    OB_PROP_STREAM_PACK_UNIT_INT = 3025,
+
     /**
      * @brief Calibration JSON file read from device (Femto Mega, read only)
      */
@@ -739,6 +745,7 @@ typedef enum {
 #define OB_PROP_LASER_ENERGY_LEVEL_INT OB_PROP_LASER_POWER_LEVEL_CONTROL_INT
 #define OB_PROP_LASER_HW_ENERGY_LEVEL_INT OB_PROP_LASER_POWER_ACTUAL_LEVEL_INT
 #define OB_PROP_DEVICE_USB3_REPEAT_IDENTIFY_BOOL OB_PROP_DEVICE_USB2_REPEAT_IDENTIFY_BOOL
+#define OB_PROP_DEPTH_NOISE_REMOVAL_FILTER_BOOL OB_PROP_DEPTH_SOFT_FILTER_BOOL
 
 /**
  * @brief The data type used to describe all property settings

diff --git a/include/libobsensor/hpp/Pipeline.hpp b/include/libobsensor/hpp/Pipeline.hpp
@@ -325,7 +325,7 @@ class OB_EXTENSION_API Config {
      * @brief The processing strategy when the FrameSet generated by the frame aggregation function does not contain the frames of all opened streams (which
      * can be caused by different frame rates of each stream, or by the loss of frames of one stream): drop directly or output to the user.
      *
-     * @param mode The frame aggregation output mode to be set (default mode is @ref OB_FRAME_AGGREGATE_OUTPUT_FULL_FRAME_REQUIRE)
+     * @param mode The frame aggregation output mode to be set (default mode is @ref OB_FRAME_AGGREGATE_OUTPUT_ANY_SITUATION)
      */
     void setFrameAggregateOutputMode(OBFrameAggregateOutputMode mode);
 

diff --git a/lib/arm32/libOrbbecSDK.so.1.10 b/lib/arm32/libOrbbecSDK.so.1.10
@@ -1 +1 @@
-libOrbbecSDK.so.1.10.16
+libOrbbecSDK.so.1.10.18
diff --git a/lib/arm32/libOrbbecSDK.so.1.10.16 → lib/arm32/libOrbbecSDK.so.1.10.18 b/lib/arm32/libOrbbecSDK.so.1.10.16 → lib/arm32/libOrbbecSDK.so.1.10.18
diff --git a/lib/arm64/libOrbbecSDK.so.1.10 b/lib/arm64/libOrbbecSDK.so.1.10
@@ -1 +1 @@
-libOrbbecSDK.so.1.10.16
+libOrbbecSDK.so.1.10.18
diff --git a/lib/arm64/libOrbbecSDK.so.1.10.16 → lib/arm64/libOrbbecSDK.so.1.10.18 b/lib/arm64/libOrbbecSDK.so.1.10.16 → lib/arm64/libOrbbecSDK.so.1.10.18
diff --git a/lib/arm64/libob_usb.so b/lib/arm64/libob_usb.so
diff --git a/lib/linux_x64/libOrbbecSDK.so.1.10 b/lib/linux_x64/libOrbbecSDK.so.1.10
@@ -1 +1 @@
-libOrbbecSDK.so.1.10.16
+libOrbbecSDK.so.1.10.18
diff --git a/lib/linux_x64/libOrbbecSDK.so.1.10.16 → lib/linux_x64/libOrbbecSDK.so.1.10.18 b/lib/linux_x64/libOrbbecSDK.so.1.10.16 → lib/linux_x64/libOrbbecSDK.so.1.10.18
diff --git a/lib/linux_x64/libob_usb.so b/lib/linux_x64/libob_usb.so
diff --git a/lib/macOS/libOrbbecSDK.1.10.16.dylib b/lib/macOS/libOrbbecSDK.1.10.16.dylib
diff --git a/lib/macOS/libOrbbecSDK.1.10.dylib b/lib/macOS/libOrbbecSDK.1.10.dylib
diff --git a/lib/macOS/libOrbbecSDK.dylib b/lib/macOS/libOrbbecSDK.dylib
diff --git a/lib/macOS/liblive555.dylib b/lib/macOS/liblive555.dylib
diff --git a/lib/macOS/libob_usb.dylib b/lib/macOS/libob_usb.dylib
diff --git a/lib/win_x64/OrbbecSDK.dll b/lib/win_x64/OrbbecSDK.dll
diff --git a/lib/win_x64/live555.dll b/lib/win_x64/live555.dll
diff --git a/lib/win_x64/ob_usb.dll b/lib/win_x64/ob_usb.dll
diff --git a/lib/win_x86/OrbbecSDK.dll b/lib/win_x86/OrbbecSDK.dll
diff --git a/lib/win_x86/live555.dll b/lib/win_x86/live555.dll
diff --git a/lib/win_x86/ob_usb.dll b/lib/win_x86/ob_usb.dll
diff --git a/misc/scripts/99-obsensor-libusb.rules b/misc/scripts/99-obsensor-libusb.rules
@@ -30,6 +30,8 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="2bc5", ATTRS{idProduct}=="0810", MODE:="066
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="2bc5", ATTRS{idProduct}=="0674", MODE:="0666",  OWNER:="root", GROUP:="video", SYMLINK+="Orbbec Gemini 2 I"
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="2bc5", ATTRS{idProduct}=="0701", MODE:="0666",  OWNER:="root", GROUP:="video", SYMLINK+="Dabai DCL"
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="2bc5", ATTRS{idProduct}=="069d", MODE:="0666",  OWNER:="root", GROUP:="video", SYMLINK+="Astra Pro2"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2bc5", ATTRS{idProduct}=="0808", MODE:="0666",  OWNER:="root", GROUP:="video", SYMLINK+="Orbbec Gemini 215"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2bc5", ATTRS{idProduct}=="0809", MODE:="0666",  OWNER:="root", GROUP:="video", SYMLINK+="Orbbec Gemini 210"
 
 # OpenNI Modules
 SUBSYSTEM=="usb", ATTR{idProduct}=="0401", ATTR{idVendor}=="2bc5", MODE:="0666", OWNER:="root", GROUP:="video", SYMLINK+="astra"