Skip to content

Commit 68120a6

Browse files
authored
Fix namespaced params (#15)
1 parent 60e29c7 commit 68120a6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

orbbec_camera/src/ob_camera_node.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ void OBCameraNode::setupDepthPostProcessFilter() {
992992
}
993993
}
994994
set_filter_srv_ = node_->create_service<SetFilter>(
995-
"set_filter", [this](const std::shared_ptr<SetFilter ::Request> request,
995+
camera_name_ + "/set_filter", [this](const std::shared_ptr<SetFilter ::Request> request,
996996
std::shared_ptr<SetFilter ::Response> response) {
997997
setFilterCallback(request, response);
998998
});
@@ -1545,8 +1545,8 @@ void OBCameraNode::getParameters() {
15451545
setAndGetNodeParameter<bool>(mirror_stream_[stream_index], param_name, false);
15461546
param_name = stream_name_[stream_index] + "_rotation";
15471547
setAndGetNodeParameter<int>(rotation_stream_[stream_index], param_name, -1);
1548-
param_name = namespace_ + camera_name_ + "_" + stream_name_[stream_index] + "_frame_id";
1549-
std::string default_frame_id = camera_name_ + "_" + stream_name_[stream_index] + "_frame";
1548+
param_name = stream_name_[stream_index] + "_frame_id";
1549+
std::string default_frame_id = namespace_ + camera_name_ + "_" + stream_name_[stream_index] + "_frame";
15501550
setAndGetNodeParameter(frame_id_[stream_index], param_name, default_frame_id);
15511551
std::string default_optical_frame_id =
15521552
namespace_ + camera_name_ + "_" + stream_name_[stream_index] + "_optical_frame";
@@ -1582,7 +1582,7 @@ void OBCameraNode::getParameters() {
15821582
setAndGetNodeParameter<std::string>(imu_rate_[stream_index], param_name, "");
15831583
param_name = stream_name_[stream_index] + "_range";
15841584
setAndGetNodeParameter<std::string>(imu_range_[stream_index], param_name, "");
1585-
param_name = namespace_ + camera_name_ + "_" + stream_name_[stream_index] + "_frame_id";
1585+
param_name = stream_name_[stream_index] + "_frame_id";
15861586
std::string default_frame_id = namespace_ + camera_name_ + "_" + stream_name_[stream_index] + "_frame";
15871587
setAndGetNodeParameter(frame_id_[stream_index], param_name, default_frame_id);
15881588
std::string default_optical_frame_id =

orbbec_camera/src/ob_camera_node_driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void OBCameraNodeDriver::init() {
150150
return;
151151
}
152152
reboot_device_srv_ = this->create_service<std_srvs::srv::Empty>(
153-
"reboot_device", std::bind(&OBCameraNodeDriver::rebootDeviceCallback, this,
153+
g_camera_name + "/reboot_device", std::bind(&OBCameraNodeDriver::rebootDeviceCallback, this,
154154
std::placeholders::_1, std::placeholders::_2));
155155
pthread_mutexattr_init(&orb_device_lock_attr_);
156156
pthread_mutexattr_setpshared(&orb_device_lock_attr_, PTHREAD_PROCESS_SHARED);

0 commit comments

Comments
 (0)