mirror of
https://github.com/orbbec/OrbbecSDK_ROS2.git
synced 2026-09-13 19:40:19 +08:00
[SDK]Update sdk version to v2.2.0
This commit is contained in:
@@ -251,7 +251,9 @@ typedef enum {
|
|||||||
ERR_IMAGE_SIZE = -5, /**< Image file size error */
|
ERR_IMAGE_SIZE = -5, /**< Image file size error */
|
||||||
ERR_OTHER = -6, /**< other errors */
|
ERR_OTHER = -6, /**< other errors */
|
||||||
ERR_DDR = -7, /**< DDR access error */
|
ERR_DDR = -7, /**< DDR access error */
|
||||||
ERR_TIMEOUT = -8 /**< timeout error */
|
ERR_TIMEOUT = -8, /**< timeout error */
|
||||||
|
ERR_MISMATCH = -9, /**< Mismatch firmware error */
|
||||||
|
ERR_UNSUPPORT_DEV = -10, /**< Unsupported device error */
|
||||||
} OBUpgradeState,
|
} OBUpgradeState,
|
||||||
OBFwUpdateState, ob_upgrade_state, ob_fw_update_state;
|
OBFwUpdateState, ob_upgrade_state, ob_fw_update_state;
|
||||||
|
|
||||||
@@ -855,6 +857,11 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
OB_SYNC_MODE_SECONDARY_SOFT_TRIGGER = 0x07,
|
OB_SYNC_MODE_SECONDARY_SOFT_TRIGGER = 0x07,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief IR and IMU sync signal
|
||||||
|
*/
|
||||||
|
OB_SYNC_MODE_IR_IMU_SYNC = 0x08,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Unknown type
|
* @brief Unknown type
|
||||||
*/
|
*/
|
||||||
@@ -1128,6 +1135,12 @@ typedef enum {
|
|||||||
* @attention In this mode, the user may return null when getting the specified type of data frame from the acquired FrameSet
|
* @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,
|
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,
|
} OB_FRAME_AGGREGATE_OUTPUT_MODE,
|
||||||
OBFrameAggregateOutputMode, ob_frame_aggregate_output_mode;
|
OBFrameAggregateOutputMode, ob_frame_aggregate_output_mode;
|
||||||
#define OB_FRAME_AGGREGATE_OUTPUT_FULL_FRAME_REQUIRE OB_FRAME_AGGREGATE_OUTPUT_ALL_TYPE_FRAME_REQUIRE
|
#define OB_FRAME_AGGREGATE_OUTPUT_FULL_FRAME_REQUIRE OB_FRAME_AGGREGATE_OUTPUT_ALL_TYPE_FRAME_REQUIRE
|
||||||
@@ -1240,6 +1253,11 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
OB_MULTI_DEVICE_SYNC_MODE_HARDWARE_TRIGGERING = 1 << 6,
|
OB_MULTI_DEVICE_SYNC_MODE_HARDWARE_TRIGGERING = 1 << 6,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief IR and IMU sync mode
|
||||||
|
*/
|
||||||
|
OB_MULTI_DEVICE_SYNC_MODE_IR_IMU_SYNC = 1 << 7,
|
||||||
|
|
||||||
} ob_multi_device_sync_mode,
|
} ob_multi_device_sync_mode,
|
||||||
OBMultiDeviceSyncMode;
|
OBMultiDeviceSyncMode;
|
||||||
|
|
||||||
@@ -1405,6 +1423,16 @@ typedef struct {
|
|||||||
char numberStr[16];
|
char numberStr[16];
|
||||||
} OBDeviceSerialNumber, ob_device_serial_number, OBSerialNumber, ob_serial_number;
|
} OBDeviceSerialNumber, ob_device_serial_number, OBSerialNumber, ob_serial_number;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Disparity offset interleaving configuration
|
||||||
|
*/
|
||||||
|
typedef struct{
|
||||||
|
uint8_t enable;
|
||||||
|
uint8_t offset0;
|
||||||
|
uint8_t offset1;
|
||||||
|
uint8_t reserved;
|
||||||
|
} OBDispOffsetConfig, ob_disp_offset_config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Frame metadata types
|
* @brief Frame metadata types
|
||||||
* @brief The frame metadata is a set of meta info generated by the device for current individual frame.
|
* @brief The frame metadata is a set of meta info generated by the device for current individual frame.
|
||||||
@@ -1588,6 +1616,16 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
OB_FRAME_METADATA_TYPE_GPIO_INPUT_DATA = 31,
|
OB_FRAME_METADATA_TYPE_GPIO_INPUT_DATA = 31,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief disparity search offset value
|
||||||
|
*/
|
||||||
|
OB_FRAME_METADATA_TYPE_DISPARITY_SEARCH_OFFSET = 32,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief disparity search range
|
||||||
|
*/
|
||||||
|
OB_FRAME_METADATA_TYPE_DISPARITY_SEARCH_RANGE = 33,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The number of frame metadata types, using for types iterating
|
* @brief The number of frame metadata types, using for types iterating
|
||||||
* @attention It is not a valid frame metadata type
|
* @attention It is not a valid frame metadata type
|
||||||
|
|||||||
@@ -440,6 +440,29 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
OB_PROP_DISP_SEARCH_RANGE_MODE_INT = 191,
|
OB_PROP_DISP_SEARCH_RANGE_MODE_INT = 191,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Laser high temperature protection
|
||||||
|
*/
|
||||||
|
OB_PROP_LASER_HIGH_TEMPERATURE_PROTECT_BOOL = 193,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief low exposure laser control
|
||||||
|
*
|
||||||
|
* @brief Currently using for DabaiA device,if the exposure value is lower than a certain threshold, the laser is turned off;
|
||||||
|
* if it exceeds another threshold, the laser is turned on again.
|
||||||
|
*/
|
||||||
|
OB_PROP_LOW_EXPOSURE_LASER_CONTROL_BOOL = 194,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief check pps sync in signal
|
||||||
|
*/
|
||||||
|
OB_PROP_CHECK_PPS_SYNC_IN_SIGNAL_BOOL = 195,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Disparity search range offset, range: [0, 127]
|
||||||
|
*/
|
||||||
|
OB_PROP_DISP_SEARCH_OFFSET_INT = 196,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Repower device (cut off power and power on again)
|
* @brief Repower device (cut off power and power on again)
|
||||||
*
|
*
|
||||||
@@ -460,7 +483,14 @@ typedef enum {
|
|||||||
* @brief laser pattern sync with delay(us)
|
* @brief laser pattern sync with delay(us)
|
||||||
*/
|
*/
|
||||||
OB_PROP_FRAME_INTERLEAVE_LASER_PATTERN_SYNC_DELAY_INT = 206,
|
OB_PROP_FRAME_INTERLEAVE_LASER_PATTERN_SYNC_DELAY_INT = 206,
|
||||||
|
/**
|
||||||
|
* @brief hardware noise remove filter switch
|
||||||
|
*/
|
||||||
|
OB_PROP_HW_NOISE_REMOVE_FILTER_ENABLE_BOOL = 211,
|
||||||
|
/**
|
||||||
|
* @brief hardware noise remove filter threshold ,range [0.0 - 1.0]
|
||||||
|
*/
|
||||||
|
OB_PROP_HW_NOISE_REMOVE_FILTER_THRESHOLD_FLOAT = 212,
|
||||||
/**
|
/**
|
||||||
* @brief Baseline calibration parameters
|
* @brief Baseline calibration parameters
|
||||||
*/
|
*/
|
||||||
@@ -544,6 +574,11 @@ typedef enum {
|
|||||||
* @brief ASIC serial number
|
* @brief ASIC serial number
|
||||||
*/
|
*/
|
||||||
OB_STRUCT_ASIC_SERIAL_NUMBER = 1063,
|
OB_STRUCT_ASIC_SERIAL_NUMBER = 1063,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Disparity offset interleaving
|
||||||
|
*/
|
||||||
|
OB_STRUCT_DISP_OFFSET_CONFIG = 1064,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Color camera auto exposure
|
* @brief Color camera auto exposure
|
||||||
|
|||||||
@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
|||||||
# Import target "ob::OrbbecSDK" for configuration "Release"
|
# Import target "ob::OrbbecSDK" for configuration "Release"
|
||||||
set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||||
set_target_properties(ob::OrbbecSDK PROPERTIES
|
set_target_properties(ob::OrbbecSDK PROPERTIES
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.1.1"
|
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.2.0"
|
||||||
IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2"
|
IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2"
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND _cmake_import_check_targets ob::OrbbecSDK )
|
list(APPEND _cmake_import_check_targets ob::OrbbecSDK )
|
||||||
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.1.1" )
|
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.2.0" )
|
||||||
|
|
||||||
# Commands beyond this point should not need to know the version.
|
# Commands beyond this point should not need to know the version.
|
||||||
set(CMAKE_IMPORT_FILE_VERSION)
|
set(CMAKE_IMPORT_FILE_VERSION)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
|||||||
libOrbbecSDK.so.2.1.1
|
libOrbbecSDK.so.2.2.0
|
||||||
BIN
Binary file not shown.
@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
|
|||||||
# Import target "ob::OrbbecSDK" for configuration "Release"
|
# Import target "ob::OrbbecSDK" for configuration "Release"
|
||||||
set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
set_property(TARGET ob::OrbbecSDK APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||||
set_target_properties(ob::OrbbecSDK PROPERTIES
|
set_target_properties(ob::OrbbecSDK PROPERTIES
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.1.1"
|
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.2.0"
|
||||||
IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2"
|
IMPORTED_SONAME_RELEASE "libOrbbecSDK.so.2"
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND _cmake_import_check_targets ob::OrbbecSDK )
|
list(APPEND _cmake_import_check_targets ob::OrbbecSDK )
|
||||||
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.1.1" )
|
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.2.0" )
|
||||||
|
|
||||||
# Commands beyond this point should not need to know the version.
|
# Commands beyond this point should not need to know the version.
|
||||||
set(CMAKE_IMPORT_FILE_VERSION)
|
set(CMAKE_IMPORT_FILE_VERSION)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1 +1 @@
|
|||||||
libOrbbecSDK.so.2.1.1
|
libOrbbecSDK.so.2.2.0
|
||||||
BIN
Binary file not shown.
Reference in New Issue
Block a user