Skip to content

Commit

Permalink
Added behaviour_tree as input to action nodes (#2952)
Browse files Browse the repository at this point in the history
* added BT as input to action node

* fix format

* Update navigate_to_pose_action.cpp

* Update navigate_through_poses_action.cpp
  • Loading branch information
Tony Najjar authored May 16, 2022
1 parent 29e4c42 commit 432b76d
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class NavigateThroughPosesAction : public BtActionNode<nav2_msgs::action::Naviga
return providedBasicPorts(
{
BT::InputPort<geometry_msgs::msg::PoseStamped>("goals", "Destinations to plan through"),
BT::InputPort<geometry_msgs::msg::PoseStamped>("behavior_tree", "Behavior tree to run"),
});
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class NavigateToPoseAction : public BtActionNode<nav2_msgs::action::NavigateToPo
return providedBasicPorts(
{
BT::InputPort<geometry_msgs::msg::PoseStamped>("goal", "Destination to plan to"),
BT::InputPort<geometry_msgs::msg::PoseStamped>("behavior_tree", "Behavior tree to run"),
});
}
};
Expand Down
2 changes: 2 additions & 0 deletions nav2_behavior_tree/nav2_tree_nodes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,14 @@
<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>
<input_port name="behavior_tree">Behavior tree to run</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>
<input_port name="behavior_tree">Behavior tree to run</input_port>
</Action>

<Action ID="ReinitializeGlobalLocalization">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void NavigateThroughPosesAction::on_tick()
"NavigateThroughPosesAction: goal not provided");
return;
}
getInput("behavior_tree", goal_.behavior_tree);
}

} // namespace nav2_behavior_tree
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ void NavigateToPoseAction::on_tick()
"NavigateToPoseAction: goal not provided");
return;
}
getInput("behavior_tree", goal_.behavior_tree);
}

} // namespace nav2_behavior_tree
Expand Down

0 comments on commit 432b76d

Please sign in to comment.