Skip to content

Commit 794e05b

Browse files
committed
Change the service name of set_software_trigger_enabled to send_software_trigger
1 parent 0b09209 commit 794e05b

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

docs/all_available_service_for_camera_control.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,8 @@ ros2 service call /camera/set_sync_interleaverlaser orbbec_camera_msgs/srv/SetIn
327327
ros2 service call /camera/set_sync_hosttime std_srvs/srv/SetBool '{data: true}'
328328
```
329329

330-
* `/camera/set_software_trigger_enabled`
330+
* `/camera/send_software_trigger`
331331

332332
```
333-
ros2 service call /camera/set_software_trigger_enabled std_srvs/srv/SetBool '{data: true}'
333+
ros2 service call /camera/send_software_trigger std_srvs/srv/SetBool '{data: true}'
334334
```

orbbec_camera/include/orbbec_camera/ob_camera_node.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,8 @@ class OBCameraNode {
313313
std::shared_ptr<SetFilter ::Response>& response);
314314
void setSYNCHostimeCallback(const std::shared_ptr<std_srvs::srv::SetBool::Request>& request,
315315
std::shared_ptr<std_srvs::srv::SetBool::Response>& response);
316-
void setSoftwareTriggerEnabledCallback(
317-
const std::shared_ptr<std_srvs::srv::SetBool::Request>& request,
318-
std::shared_ptr<std_srvs::srv::SetBool::Response>& response);
316+
void sendSoftwareTriggerCallback(const std::shared_ptr<std_srvs::srv::SetBool::Request>& request,
317+
std::shared_ptr<std_srvs::srv::SetBool::Response>& response);
319318

320319
bool toggleSensor(const stream_index_pair& stream_index, bool enabled, std::string& msg);
321320

@@ -496,7 +495,7 @@ class OBCameraNode {
496495
rclcpp::Service<std_srvs::srv::SetBool>::SharedPtr set_reset_timestamp_srv_;
497496
rclcpp::Service<SetInt32>::SharedPtr set_interleaver_laser_sync_srv_;
498497
rclcpp::Service<std_srvs::srv::SetBool>::SharedPtr set_sync_host_time_srv_;
499-
rclcpp::Service<std_srvs::srv::SetBool>::SharedPtr set_software_trigger_enabled_srv_;
498+
rclcpp::Service<std_srvs::srv::SetBool>::SharedPtr send_software_trigger_srv_;
500499
rclcpp::Service<SetFilter>::SharedPtr set_filter_srv_;
501500

502501
bool enable_sync_output_accel_gyro_ = false;

orbbec_camera/src/ros_service.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ void OBCameraNode::setupCameraCtrlServices() {
206206
std::shared_ptr<SetBool::Response> response) {
207207
setSYNCHostimeCallback(request, response);
208208
});
209-
set_software_trigger_enabled_srv_ = node_->create_service<SetBool>(
210-
"set_software_trigger_enabled", [this](const std::shared_ptr<SetBool::Request> request,
211-
std::shared_ptr<SetBool::Response> response) {
212-
setSoftwareTriggerEnabledCallback(request, response);
209+
send_software_trigger_srv_ = node_->create_service<SetBool>(
210+
"send_software_trigger", [this](const std::shared_ptr<SetBool::Request> request,
211+
std::shared_ptr<SetBool::Response> response) {
212+
sendSoftwareTriggerCallback(request, response);
213213
});
214214
set_write_customerdata_srv_ = node_->create_service<SetString>(
215215
"set_write_customer_data", [this](const std::shared_ptr<SetString::Request> request,
@@ -1063,11 +1063,13 @@ void OBCameraNode::setSYNCHostimeCallback(
10631063
}
10641064
}
10651065

1066-
void OBCameraNode::setSoftwareTriggerEnabledCallback(
1066+
void OBCameraNode::sendSoftwareTriggerCallback(
10671067
const std::shared_ptr<std_srvs::srv::SetBool::Request>& request,
10681068
std::shared_ptr<std_srvs::srv::SetBool::Response>& response) {
10691069
try {
1070-
software_trigger_enabled_ = request->data;
1070+
if (request->data) {
1071+
device_->triggerCapture();
1072+
}
10711073
response->success = true;
10721074
} catch (const ob::Error& e) {
10731075
response->message = e.getMessage();

0 commit comments

Comments
 (0)