Skip to content

Commit 6d397e3

Browse files
committed
fixed stop cause crash
1 parent ab77864 commit 6d397e3

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

orbbec_camera/include/orbbec_camera/ob_camera_node.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ class OBCameraNode {
137137
void clean();
138138

139139
void startStreams();
140+
141+
void startIMU();
142+
140143

141144
private:
142145
struct IMUData {
@@ -161,8 +164,6 @@ class OBCameraNode {
161164

162165
void setupCameraCtrlServices();
163166

164-
void startIMU();
165-
166167
void stopStreams();
167168

168169
void stopIMU();

orbbec_camera/src/ob_camera_node.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ void OBCameraNode::clean() {
9292
}
9393
RCLCPP_WARN_STREAM(logger_, "stop streams");
9494
stopStreams();
95+
stopIMU();
9596
RCLCPP_WARN_STREAM(logger_, "Destroy ~OBCameraNode DONE");
9697
if (rgb_buffer_) {
9798
delete[] rgb_buffer_;
@@ -259,7 +260,6 @@ void OBCameraNode::startStreams() {
259260
pipeline_->enableFrameSync();
260261
}
261262
pipeline_started_.store(true);
262-
startIMU();
263263
}
264264

265265
void OBCameraNode::startIMU() {
@@ -316,7 +316,6 @@ void OBCameraNode::stopStreams() {
316316
}
317317
try {
318318
pipeline_->stop();
319-
stopIMU();
320319
} catch (const ob::Error &e) {
321320
RCLCPP_ERROR_STREAM(logger_, "Failed to stop pipeline: " << e.getMessage());
322321
}

orbbec_camera/src/ob_camera_node_driver.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ void OBCameraNodeDriver::initializeDevice(const std::shared_ptr<ob::Device> &dev
310310
}
311311
ob_camera_node_ = std::make_unique<OBCameraNode>(this, device_, parameters_);
312312
ob_camera_node_->startStreams();
313+
ob_camera_node_->startIMU();
313314
device_connected_ = true;
314315
device_info_ = device_->getDeviceInfo();
315316
CHECK_NOTNULL(device_info_.get());

0 commit comments

Comments
 (0)