Merge pull request robotics-ETF#5 from robotics-ETF/trajectory-planning

Fixed error since function 'checkTerminatingCondition' must accept one argument.
ncovic1 · Mar 15, 2024 · bf26d50 · bf26d50
2 parents 7d8c6be + ea38f63
commit bf26d50
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/etf_modules/RPMPLv2 b/src/etf_modules/RPMPLv2
diff --git 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
diff --git a/src/external_modules/xarm_ros2 b/src/external_modules/xarm_ros2
+14 −0		.github/dependabot.yml
+0 −12		.github/workflows/ci-check-docs.yml
+3 −3		.github/workflows/ci-format.yaml
+83 −0		.github/workflows/ci-humble.yaml
+17 −13		.github/workflows/ci-iron.yaml
+83 −0		.github/workflows/ci-rolling.yaml
+4 −4		Docker/Dockerfile
+1 −1		Docker/entrypoint.sh
+5 −5		README.md
+7 −38		doc/index.rst
+53 −16		gazebo_ros2_control/CHANGELOG.rst
+4 −2		gazebo_ros2_control/CMakeLists.txt
+1 −1		gazebo_ros2_control/README.md
+1 −1		gazebo_ros2_control/package.xml
+48 −11		gazebo_ros2_control/src/gazebo_ros2_control_plugin.cpp
+26 −22		gazebo_ros2_control/src/gazebo_system.cpp
+36 −9		gazebo_ros2_control_demos/CHANGELOG.rst
+3 −2		gazebo_ros2_control_demos/CMakeLists.txt
+0 −1		gazebo_ros2_control_demos/config/cart_controller.yaml
+2 −8		gazebo_ros2_control_demos/config/cart_controller_effort.yaml
+1 −5		gazebo_ros2_control_demos/config/cart_controller_velocity.yaml
+1 −1		gazebo_ros2_control_demos/config/diff_drive_controller.yaml
+1 −0		gazebo_ros2_control_demos/config/tricycle_drive_controller.yaml
+1 −1		gazebo_ros2_control_demos/examples/example_effort.cpp
+5 −5		gazebo_ros2_control_demos/launch/cart_example_effort.launch.py
+4 −4		gazebo_ros2_control_demos/launch/cart_example_position.launch.py
+4 −4		gazebo_ros2_control_demos/launch/cart_example_velocity.launch.py
+3 −3		gazebo_ros2_control_demos/launch/diff_drive.launch.py
+3 −3		gazebo_ros2_control_demos/launch/gripper_mimic_joint_example.launch.py
+8 −8		gazebo_ros2_control_demos/launch/tricycle_drive.launch.py
+1 −2		gazebo_ros2_control_demos/package.xml
+2 −6		gazebo_ros2_control_demos/urdf/test_cart_effort.xacro.urdf
+2 −6		gazebo_ros2_control_demos/urdf/test_cart_position.xacro.urdf
+2 −6		gazebo_ros2_control_demos/urdf/test_cart_velocity.xacro.urdf