mirror of
https://github.com/orbbec/OrbbecSDK_ROS2.git
synced 2026-10-13 07:49:49 +08:00
update OrbbecSDK version to 2.7.2
This commit is contained in:
@@ -572,16 +572,18 @@ typedef enum {
|
|||||||
OB_PROP_COLOR_RIGHT_FLIP_BOOL = 244,
|
OB_PROP_COLOR_RIGHT_FLIP_BOOL = 244,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Color AE mode
|
* @brief Device AE reference source
|
||||||
* - 0: Depth based
|
* - 0: Depth based
|
||||||
* - 1: Color based
|
* - 1: Color based
|
||||||
*/
|
*/
|
||||||
OB_PROP_COLOR_AE_MODE_INT = 247,
|
OB_PROP_DEVICE_AE_REFERENCE_INT = 247,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief COLOR FAST AE
|
* @brief Device AE strategy
|
||||||
|
* - 0: Default
|
||||||
|
* - 1: Motion
|
||||||
*/
|
*/
|
||||||
OB_PROP_COLOR_FAST_AE_BOOL = 248,
|
OB_PROP_DEVICE_AE_STRATEGY_INT = 248,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Color camera ROI brightness adjustment
|
* @brief Color camera ROI brightness adjustment
|
||||||
|
|||||||
@@ -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.7.1"
|
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.7.2"
|
||||||
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.7.1" )
|
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.7.2" )
|
||||||
|
|
||||||
# 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)
|
||||||
|
|||||||
@@ -9,19 +9,19 @@
|
|||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# The variable CVF_VERSION must be set before calling configure_file().
|
||||||
|
|
||||||
|
|
||||||
set(PACKAGE_VERSION "2.7.1")
|
set(PACKAGE_VERSION "2.7.2")
|
||||||
|
|
||||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
else()
|
else()
|
||||||
|
|
||||||
if("2.7.1" MATCHES "^([0-9]+)\\.")
|
if("2.7.2" MATCHES "^([0-9]+)\\.")
|
||||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
set(CVF_VERSION_MAJOR "2.7.1")
|
set(CVF_VERSION_MAJOR "2.7.2")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(PACKAGE_FIND_VERSION_RANGE)
|
if(PACKAGE_FIND_VERSION_RANGE)
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
libOrbbecSDK.so.2.7.1
|
libOrbbecSDK.so.2.7.2
|
||||||
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.7.1"
|
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.7.2"
|
||||||
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.7.1" )
|
list(APPEND _cmake_import_check_files_for_ob::OrbbecSDK "${_IMPORT_PREFIX}/lib/libOrbbecSDK.so.2.7.2" )
|
||||||
|
|
||||||
# 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)
|
||||||
|
|||||||
@@ -9,19 +9,19 @@
|
|||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# The variable CVF_VERSION must be set before calling configure_file().
|
||||||
|
|
||||||
|
|
||||||
set(PACKAGE_VERSION "2.7.1")
|
set(PACKAGE_VERSION "2.7.2")
|
||||||
|
|
||||||
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
||||||
else()
|
else()
|
||||||
|
|
||||||
if("2.7.1" MATCHES "^([0-9]+)\\.")
|
if("2.7.2" MATCHES "^([0-9]+)\\.")
|
||||||
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
|
||||||
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
|
||||||
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
|
||||||
endif()
|
endif()
|
||||||
else()
|
else()
|
||||||
set(CVF_VERSION_MAJOR "2.7.1")
|
set(CVF_VERSION_MAJOR "2.7.2")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(PACKAGE_FIND_VERSION_RANGE)
|
if(PACKAGE_FIND_VERSION_RANGE)
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
libOrbbecSDK.so.2.7.1
|
libOrbbecSDK.so.2.7.2
|
||||||
BIN
Binary file not shown.
@@ -985,16 +985,16 @@ void OBCameraNode::setupDevices() {
|
|||||||
RCLCPP_ERROR(logger_, "intra camera sync reference does not support this setting");
|
RCLCPP_ERROR(logger_, "intra camera sync reference does not support this setting");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (device_->isPropertySupported(OB_PROP_COLOR_FAST_AE_BOOL, OB_PERMISSION_WRITE)) {
|
if (device_->isPropertySupported(OB_PROP_DEVICE_AE_STRATEGY_INT, OB_PERMISSION_WRITE)) {
|
||||||
device_->setIntProperty(OB_PROP_COLOR_FAST_AE_BOOL, (enable_sports_mode_ ? 0 : 1));
|
device_->setIntProperty(OB_PROP_DEVICE_AE_STRATEGY_INT, (enable_sports_mode_ ? 0 : 1));
|
||||||
RCLCPP_INFO_STREAM(logger_, "Setting Sports Mode to " << (enable_sports_mode_ ? "ON" : "OFF"));
|
RCLCPP_INFO_STREAM(logger_, "Setting Sports Mode to " << (enable_sports_mode_ ? "ON" : "OFF"));
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ae_mode_ == "depthbased" || ae_mode_ == "colorbased") &&
|
if ((ae_mode_ == "depthbased" || ae_mode_ == "colorbased") &&
|
||||||
device_->isPropertySupported(OB_PROP_COLOR_AE_MODE_INT, OB_PERMISSION_WRITE)) {
|
device_->isPropertySupported(OB_PROP_DEVICE_AE_REFERENCE_INT, OB_PERMISSION_WRITE)) {
|
||||||
if (device_->isPropertySupported(OB_PROP_COLOR_AE_MODE_INT, OB_PERMISSION_WRITE)) {
|
if (device_->isPropertySupported(OB_PROP_DEVICE_AE_REFERENCE_INT, OB_PERMISSION_WRITE)) {
|
||||||
auto ae_mode = ae_mode_ == "depthbased" ? 0 : 1;
|
auto ae_mode = ae_mode_ == "depthbased" ? 0 : 1;
|
||||||
device_->setIntProperty(OB_PROP_COLOR_AE_MODE_INT, ae_mode);
|
device_->setIntProperty(OB_PROP_DEVICE_AE_REFERENCE_INT, ae_mode);
|
||||||
RCLCPP_INFO_STREAM(logger_, "Setting AE Mode to " << ae_mode_);
|
RCLCPP_INFO_STREAM(logger_, "Setting AE Mode to " << ae_mode_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1482,9 +1482,10 @@ void OBCameraNode::getUserCalibParamsCallback(
|
|||||||
void OBCameraNode::setAEModeCallback(const std::shared_ptr<SetString::Request>& request,
|
void OBCameraNode::setAEModeCallback(const std::shared_ptr<SetString::Request>& request,
|
||||||
std::shared_ptr<SetString::Response>& response) {
|
std::shared_ptr<SetString::Response>& response) {
|
||||||
try {
|
try {
|
||||||
if (device_->isPropertySupported(OB_PROP_COLOR_AE_MODE_INT, OB_PERMISSION_WRITE) &&
|
if (device_->isPropertySupported(OB_PROP_DEVICE_AE_REFERENCE_INT, OB_PERMISSION_WRITE) &&
|
||||||
(request->data == "depthbased" || request->data == "colorbased")) {
|
(request->data == "depthbased" || request->data == "colorbased")) {
|
||||||
device_->setIntProperty(OB_PROP_COLOR_AE_MODE_INT, request->data == "depthbased" ? 0 : 1);
|
device_->setIntProperty(OB_PROP_DEVICE_AE_REFERENCE_INT,
|
||||||
|
request->data == "depthbased" ? 0 : 1);
|
||||||
response->success = true;
|
response->success = true;
|
||||||
response->message = "set AE mode success";
|
response->message = "set AE mode success";
|
||||||
} else {
|
} else {
|
||||||
@@ -1499,8 +1500,8 @@ void OBCameraNode::setAEModeCallback(const std::shared_ptr<SetString::Request>&
|
|||||||
void OBCameraNode::setSportsModeCallback(const std::shared_ptr<SetBool::Request>& request,
|
void OBCameraNode::setSportsModeCallback(const std::shared_ptr<SetBool::Request>& request,
|
||||||
std::shared_ptr<SetBool::Response>& response) {
|
std::shared_ptr<SetBool::Response>& response) {
|
||||||
try {
|
try {
|
||||||
if (device_->isPropertySupported(OB_PROP_COLOR_FAST_AE_BOOL, OB_PERMISSION_WRITE)) {
|
if (device_->isPropertySupported(OB_PROP_DEVICE_AE_STRATEGY_INT, OB_PERMISSION_WRITE)) {
|
||||||
device_->setIntProperty(OB_PROP_COLOR_FAST_AE_BOOL, request->data ? 1 : 0);
|
device_->setIntProperty(OB_PROP_DEVICE_AE_STRATEGY_INT, request->data ? 1 : 0);
|
||||||
response->success = true;
|
response->success = true;
|
||||||
response->message = "set sports mode success";
|
response->message = "set sports mode success";
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user