From ea38f63d80892f63c44aefaa36a8b4d1f754097a Mon Sep 17 00:00:00 2001 From: nermin Date: Fri, 15 Mar 2024 17:52:42 +0100 Subject: [PATCH] Fixed error since function 'checkTerminatingCondition' must accept one argument. --- src/etf_modules/RPMPLv2 | 2 +- src/etf_modules/sim_bringup/src/demos/RealTimePlanningNode.cpp | 2 +- src/external_modules/gazebo_ros2_control | 2 +- src/external_modules/xarm_ros2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/etf_modules/RPMPLv2 b/src/etf_modules/RPMPLv2 index 87aaa38d..e928ae98 160000 --- a/src/etf_modules/RPMPLv2 +++ b/src/etf_modules/RPMPLv2 @@ -1 +1 @@ -Subproject commit 87aaa38d97ac01e1af1553c40756fe6cd742928e +Subproject commit e928ae98e19e16c14a14d70eb994afe53e0509bc diff --git a/src/etf_modules/sim_bringup/src/demos/RealTimePlanningNode.cpp b/src/etf_modules/sim_bringup/src/demos/RealTimePlanningNode.cpp index 29c6edcf..190007e2 100644 --- a/src/etf_modules/sim_bringup/src/demos/RealTimePlanningNode.cpp +++ b/src/etf_modules/sim_bringup/src/demos/RealTimePlanningNode.cpp @@ -116,7 +116,7 @@ void sim_bringup::RealTimePlanningNode::planningCallback() // Planner info and terminating condition DP::planner_info->setNumIterations(DP::planner_info->getNumIterations() + 1); DP::planner_info->addIterationTime(DP::getElapsedTime(DP::time_start, std::chrono::steady_clock::now())); - if (DP::checkTerminatingCondition()) + if (DP::checkTerminatingCondition(DP::status)) rclcpp::shutdown(); RCLCPP_INFO(rclcpp::get_logger("rclcpp"), "----------------------------------------------------------------------------\n"); diff --git a/src/external_modules/gazebo_ros2_control b/src/external_modules/gazebo_ros2_control index 6458276c..5ea56178 160000 --- a/src/external_modules/gazebo_ros2_control +++ b/src/external_modules/gazebo_ros2_control @@ -1 +1 @@ -Subproject commit 6458276ca1eaf3ee646afa8e0833386f9785e585 +Subproject commit 5ea56178dbca66f0f5894a8db3f545738448226d diff --git a/src/external_modules/xarm_ros2 b/src/external_modules/xarm_ros2 index 7797ce30..8427642f 160000 --- a/src/external_modules/xarm_ros2 +++ b/src/external_modules/xarm_ros2 @@ -1 +1 @@ -Subproject commit 7797ce30ee25551d31469485dccc0f8af4997f0b +Subproject commit 8427642f99ca332eaab90594e057d56997a85ed6