Skip to content

Commit

Permalink
Merge pull request #135 from cactusdynamics/fix-ros2-integration
Browse files Browse the repository at this point in the history
fix ROS2 integration
  • Loading branch information
shuhaowu authored Sep 4, 2024
2 parents 239944a + 94f93e1 commit c950edb
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 13 deletions.
2 changes: 0 additions & 2 deletions include/cactus_rt/ros2/app.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ class App : public cactus_rt::App {
return thread;
}

void Start(int64_t start_monotonic_time_ns = -1) override;

void RequestStop() override;

void Join() override;
Expand Down
11 changes: 0 additions & 11 deletions src/cactus_rt/ros2/app.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <rclcpp/rclcpp.hpp>

#include "cactus_rt/signal_handler.h"
#include "cactus_rt/utils.h"

namespace cactus_rt::ros2 {

Expand Down Expand Up @@ -60,16 +59,6 @@ App::~App() {
rclcpp::shutdown();
}

void App::Start(int64_t start_monotonic_time_ns) {
// Start the Ros2ExecutorThread first. Don't think it is 100% necessary but why not get a head start.
if (start_monotonic_time_ns == -1) {
start_monotonic_time_ns = NowNs();
}

ros2_executor_thread_->Start(start_monotonic_time_ns);
cactus_rt::App::Start(start_monotonic_time_ns);
}

void App::RequestStop() {
// Stop all the registered threads first, then stop the Ros2ExecutorThread
// after the normal threads are joined to ensure we flush messages. See App::Join.
Expand Down

0 comments on commit c950edb

Please sign in to comment.