add the missing ports and description for the XML nodes (ros-navigati…

…on#2866) * add the missing ports and description * update * update
EnjoyRobotics · Jun 30, 2022 · 9977b7f · 9977b7f
1 parent 7d595a1
commit 9977b7f
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/...vior_tree/include/nav2_behavior_tree/plugins/action/compute_path_through_poses_action.hpp b/...vior_tree/include/nav2_behavior_tree/plugins/action/compute_path_through_poses_action.hpp
@@ -68,7 +68,9 @@ class ComputePathThroughPosesAction
           "Destinations to plan through"),
         BT::InputPort<geometry_msgs::msg::PoseStamped>(
           "start", "Start pose of the path if overriding current robot pose"),
-        BT::InputPort<std::string>("planner_id", ""),
+        BT::InputPort<std::string>(
+          "planner_id", "",
+          "Mapped name to the planner plugin type to use"),
       });
   }
 };

diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/plugins/action/compute_path_to_pose_action.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/plugins/action/compute_path_to_pose_action.hpp
@@ -63,7 +63,9 @@ class ComputePathToPoseAction : public BtActionNode<nav2_msgs::action::ComputePa
         BT::InputPort<geometry_msgs::msg::PoseStamped>("goal", "Destination to plan to"),
         BT::InputPort<geometry_msgs::msg::PoseStamped>(
           "start", "Start pose of the path if overriding current robot pose"),
-        BT::InputPort<std::string>("planner_id", ""),
+        BT::InputPort<std::string>(
+          "planner_id", "",
+          "Mapped name to the planner plugin type to use"),
       });
   }
 };

diff --git a/nav2_behavior_tree/nav2_tree_nodes.xml b/nav2_behavior_tree/nav2_tree_nodes.xml
@@ -11,6 +11,8 @@
       <input_port name="backup_dist">Distance to backup</input_port>
       <input_port name="backup_speed">Speed at which to backup</input_port>
       <input_port name="time_allowance">Allowed time for reversing</input_port>
+      <input_port name="server_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="CancelControl">
@@ -35,25 +37,32 @@
 
     <Action ID="ClearEntireCostmap">
       <input_port name="service_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="ComputePathToPose">
       <input_port name="goal">Destination to plan to</input_port>
       <input_port name="start">Start pose of the path if overriding current robot pose</input_port>
+      <input_port name="planner_id">Mapped name to the planner plugin type to use</input_port>
+      <input_port name="service_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
       <output_port name="path">Path created by ComputePathToPose node</output_port>
-      <input_port name="planner_id"/>
     </Action>
 
     <Action ID="ComputePathThroughPoses">
       <input_port name="goals">Destinations to plan through</input_port>
       <input_port name="start">Start pose of the path if overriding current robot pose</input_port>
+      <input_port name="service_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
+      <input_port name="planner_id">Mapped name to the planner plugin type to use</input_port>
       <output_port name="path">Path created by ComputePathToPose node</output_port>
-      <input_port name="planner_id"/>
     </Action>
 
     <Action ID="RemovePassedGoals">
       <input_port name="input_goals">Input goals to remove if passed</input_port>
       <input_port name="radius">Radius tolerance on a goal to consider it passed</input_port>
+      <input_port name="global_frame">Global frame</input_port>
+      <input_port name="robot_base_frame">Robot base frame</input_port>
       <output_port name="output_goals">Set of goals after removing any passed</output_port>
     </Action>
 
@@ -71,17 +80,25 @@
       <input_port name="controller_id" default="FollowPath"/>
       <input_port name="path">Path to follow</input_port>
       <input_port name="goal_checker_id" default="GoalChecker">Goal checker</input_port>
+      <input_port name="service_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="NavigateToPose">
         <input_port name="goal">Goal</input_port>
+        <input_port name="service_name">Service name</input_port>
+        <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="NavigateThroughPoses">
         <input_port name="goals">Goals</input_port>
+        <input_port name="service_name">Service name</input_port>
+        <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="ReinitializeGlobalLocalization">
+        <input_port name="service_name">Service name</input_port>
+        <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="TruncatePath">
@@ -111,15 +128,21 @@
     <Action ID="Spin">
       <input_port name="spin_dist">Spin distance</input_port>
       <input_port name="time_allowance">Allowed time for spinning</input_port>
+      <input_port name="server_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <Action ID="Wait">
       <input_port name="wait_duration">Wait time</input_port>
+      <input_port name="server_name">Service name</input_port>
+      <input_port name="server_timeout">Server timeout</input_port>
     </Action>
 
     <!-- ############################### CONDITION NODES ############################## -->
     <Condition ID="GoalReached">
         <input_port name="goal">Destination</input_port>
+        <input_port name="global_frame">Reference frame</input_port>
+        <input_port name="robot_base_frame">Robot base frame</input_port>
     </Condition>
 
     <Condition ID="IsStuck"/>
@@ -173,6 +196,8 @@
 
     <Decorator ID="DistanceController">
       <input_port name="distance">Distance</input_port>
+      <input_port name="global_frame">Reference frame</input_port>
+      <input_port name="robot_base_frame">Robot base frame</input_port>
     </Decorator>
 
     <Decorator ID="SingleTrigger">