Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preempting and recalling are active states #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preempting and recalling are active states #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/behaviortree_ros/bt_action_node.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class RosActionNode : public BT::ActionNodeBase
REJECTED_BY_SERVER = 2
};

/// Called when a service call failed. Can be overriden by the user.
/// Called when a service call failed. Can be overridden by the user.
virtual NodeStatus onFailedRequest(FailureCause failure)
{
return NodeStatus::FAILURE;
Expand Down Expand Up @@ -138,8 +138,9 @@ class RosActionNode : public BT::ActionNodeBase

// Please refer to these states

if( action_state == actionlib::SimpleClientGoalState::PENDING ||
action_state == actionlib::SimpleClientGoalState::ACTIVE )
if( action_state == actionlib::SimpleClientGoalState::ACTIVE ||
action_state == actionlib::SimpleClientGoalState::PENDING ||
action_state == actionlib::SimpleClientGoalState::PREEMPTING )
{
return NodeStatus::RUNNING;
}
Expand Down