Bump to v1.5.0

README.MD

@@ -1,6 +1,6 @@
 # orbbec_camera
 
-[![stable](http://badges.github.io/stability-badges/dist/stable.svg)](http://github.com/badges/stability-badges) ![version](https://img.shields.io/badge/version-1.4.6-green)
+[![stable](http://badges.github.io/stability-badges/dist/stable.svg)](http://github.com/badges/stability-badges) ![version](https://img.shields.io/badge/version-1.5.0-green)
 ---
 OrbbecSDK ROS 2 is a wrapper for the Orbbec 3D camera that provides seamless integration with the ROS 2 environment. It
 supports ROS 2 Foxy, Galactic, and Humble distributions.

orbbec_camera/SDK/include/libobsensor/h/ObTypes.h

@@ -966,7 +966,7 @@ typedef struct {
 } OBSpatialAdvancedFilterParams, ob_spatial_advanced_filter_params;
 
 typedef enum OB_EDGE_NOISE_REMOVAL_TYPE {
-    OB_MG_FILTER = 0,
+    OB_MG_FILTER  = 0,
     OB_MGH_FILTER = 1,  // horizontal MG
     OB_MGA_FILTER = 2,  // asym MG
     OB_MGC_FILTER = 3,
@@ -1595,20 +1595,21 @@ typedef enum {
 
     /**
      * @brief Laser power value in mW
+     *
+     * @attention The laser power value is an approximate estimation.
      */
     OB_FRAME_METADATA_TYPE_LASER_POWER = 28,
 
     /**
-     * @brief Laser power mode
-     * @brief 0: Laser off, 1: Laser on
+     * @brief Laser power level
      */
-    OB_FRAME_METADATA_TYPE_LASER_POWER_MODE = 29,
+    OB_FRAME_METADATA_TYPE_LASER_POWER_LEVEL = 29,
 
     /**
-     * @brief Emitter mode
-     * @brief 0: Laser off, 1: Laser on, 2: auto
+     * @brief Laser status
+     * @brief 0: Laser off, 1: Laser on
      */
-    OB_FRAME_METADATA_TYPE_EMITTER_MODE = 30,
+    OB_FRAME_METADATA_TYPE_LASER_STATUS = 30,
 
     /**
      * @brief GPIO input data
@@ -1623,6 +1624,10 @@ typedef enum {
 } ob_frame_metadata_type,
     OBFrameMetadataType;
 
+// For compatibility
+#define OB_FRAME_METADATA_TYPE_LASER_POWER_MODE OB_FRAME_METADATA_TYPE_LASER_POWER_LEVEL
+#define OB_FRAME_METADATA_TYPE_EMITTER_MODE OB_FRAME_METADATA_TYPE_LASER_STATUS
+
 /**
  * @brief Callback for file transfer
  *

orbbec_camera/SDK/include/libobsensor/h/Property.h

@@ -234,9 +234,9 @@ typedef enum {
     OB_PROP_SWITCH_IR_MODE_INT = 98,
 
     /**
-     * @brief Laser energy level
+     * @brief Laser power level
      */
-    OB_PROP_LASER_ENERGY_LEVEL_INT = 99,
+    OB_PROP_LASER_POWER_LEVEL_CONTROL_INT = 99,
 
     /**
      * @brief LDP's measure distance, unit: mm
@@ -299,10 +299,10 @@ typedef enum {
     OB_PROP_DEPTH_ROTATE_INT = 118,
 
     /**
-     * @brief Get hardware laser energy level which real state of laser element. OB_PROP_LASER_ENERGY_LEVEL_INT（99）will effect this command
+     * @brief Get hardware laser power actual level which real state of laser element. OB_PROP_LASER_POWER_LEVEL_CONTROL_INT99）will effect this command
      * which it setting and changed the hardware laser energy level.
      */
-    OB_PROP_LASER_HW_ENERGY_LEVEL_INT = 119,
+    OB_PROP_LASER_POWER_ACTUAL_LEVEL_INT = 119,
 
     /**
      * @brief USB's power state, enum type: OBUSBPowerState
@@ -393,7 +393,7 @@ typedef enum {
      * @brief Laser on/off alternate mode, 0: off, 1: on-off alternate, 2: off-on alternate
      * @attention When turn on this mode, the laser will turn on and turn off alternately each frame.
      */
-    OB_PROP_LASER_ON_OFF_MODE_INT = 175,
+    OB_PROP_LASER_ON_OFF_PATTERN_INT = 175,
 
     /**
      * @brief Depth unit flexible adjustment\
@@ -698,7 +698,11 @@ typedef enum {
 } OBPropertyID,
     ob_property_id;
 
+// For backward compatibility
 #define OB_PROP_TIMER_RESET_TRIGGLE_OUT_ENABLE_BOOL OB_PROP_TIMER_RESET_TRIGGER_OUT_ENABLE_BOOL
+#define OB_PROP_LASER_ON_OFF_MODE_INT OB_PROP_LASER_ON_OFF_PATTERN_INT
+#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
 
 /**
  * @brief The data type used to describe all property settings

orbbec_camera/SDK/lib/arm32/libOrbbecSDK.so.1.10

@@ -1 +1 @@
-libOrbbecSDK.so.1.10.1
+libOrbbecSDK.so.1.10.2

orbbec_camera/SDK/lib/arm64/libOrbbecSDK.so.1.10

@@ -1 +1 @@
-libOrbbecSDK.so.1.10.1
+libOrbbecSDK.so.1.10.2

orbbec_camera/SDK/lib/x64/libOrbbecSDK.so.1.10

@@ -1 +1 @@
-libOrbbecSDK.so.1.10.1
+libOrbbecSDK.so.1.10.2

orbbec_camera/include/orbbec_camera/constants.h

@@ -22,8 +22,8 @@
 #define THREAD_NUM 4
 
 #define OB_ROS_MAJOR_VERSION 1
-#define OB_ROS_MINOR_VERSION 4
-#define OB_ROS_PATCH_VERSION 8
+#define OB_ROS_MINOR_VERSION 5
+#define OB_ROS_PATCH_VERSION 0
 
 #ifndef STRINGIFY
 #define STRINGIFY(arg) #arg

orbbec_camera/package.xml

@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>orbbec_camera</name>
-  <version>1.4.8</version>
+  <version>1.5.0</version>
   <description>Orbbec Camera package</description>
   <maintainer email="mocun@orbbec.com">Joe Dong</maintainer>
   <license>TODO: License declaration</license>