mirror of
https://github.com/orbbec/OrbbecSDK_ROS2.git
synced 2026-10-10 06:29:50 +08:00
Fix dabai dcw2 and dabai dw2 device enumeration failure with old firmware
This commit is contained in:
@@ -81,7 +81,7 @@ def generate_launch_description():
|
||||
DeclareLaunchArgument('align_mode', default_value='HW'),
|
||||
DeclareLaunchArgument('laser_energy_level', default_value='-1'),
|
||||
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
||||
DeclareLaunchArgument('industry_mode', default_value='default'),
|
||||
DeclareLaunchArgument('industry_mode', default_value=''),
|
||||
]
|
||||
|
||||
# Node configuration
|
||||
|
||||
@@ -58,7 +58,7 @@ def generate_launch_description():
|
||||
DeclareLaunchArgument('align_mode', default_value='HW'),
|
||||
DeclareLaunchArgument('laser_energy_level', default_value='-1'),
|
||||
DeclareLaunchArgument('enable_heartbeat', default_value='false'),
|
||||
DeclareLaunchArgument('industry_mode', default_value='default'),
|
||||
DeclareLaunchArgument('industry_mode', default_value=''),
|
||||
]
|
||||
|
||||
# Node configuration
|
||||
|
||||
@@ -177,7 +177,8 @@ void OBCameraNode::setupDevices() {
|
||||
RCLCPP_INFO_STREAM(logger_, "Setting heartbeat to " << (enable_heartbeat_ ? "ON" : "OFF"));
|
||||
TRY_TO_SET_PROPERTY(setBoolProperty, OB_PROP_HEARTBEAT_BOOL, enable_heartbeat_);
|
||||
}
|
||||
if (device_->isPropertySupported(OB_PROP_DEPTH_INDUSTRY_MODE_INT, OB_PERMISSION_READ_WRITE)) {
|
||||
if (!industry_mode_.empty() &&
|
||||
device_->isPropertySupported(OB_PROP_DEPTH_INDUSTRY_MODE_INT, OB_PERMISSION_READ_WRITE)) {
|
||||
if (industry_mode_ == "default") {
|
||||
OBDepthIndustryMode mode = OB_INDUSTRY_DEFAULT;
|
||||
device_->setIntProperty(OB_PROP_DEPTH_INDUSTRY_MODE_INT, (int32_t)mode);
|
||||
@@ -1208,7 +1209,7 @@ void OBCameraNode::getParameters() {
|
||||
setAndGetNodeParameter<int>(min_depth_limit_, "min_depth_limit", 0);
|
||||
setAndGetNodeParameter<int>(max_depth_limit_, "max_depth_limit", 0);
|
||||
setAndGetNodeParameter<bool>(enable_heartbeat_, "enable_heartbeat", false);
|
||||
setAndGetNodeParameter<std::string>(industry_mode_, "industry_mode", "default");
|
||||
setAndGetNodeParameter<std::string>(industry_mode_, "industry_mode", "");
|
||||
setAndGetNodeParameter<bool>(enable_color_undistortion_, "enable_color_undistortion", false);
|
||||
setAndGetNodeParameter<int>(color_ae_roi_left_, "color_ae_roi_left", -1);
|
||||
setAndGetNodeParameter<int>(color_ae_roi_top_, "color_ae_roi_top", -1);
|
||||
|
||||
Reference in New Issue
Block a user