Skip to content

Add condition nodes for time and distance replanning #1705

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

Merged
merged 9 commits into from
May 27, 2020
Merged

Add condition nodes for time and distance replanning #1705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cf39a54
Add condition nodes and behavior tree to enable replan on new goal
naiveHobo May 8, 2020
da73f76
Fix time expired and distance traveled conditions
naiveHobo May 16, 2020
363f974
Remove new_goal_received from blackboard
naiveHobo May 16, 2020
da6f5b2
Fix IDLE check condition in new condition nodes
naiveHobo May 17, 2020
24d39ba
Fix lint errors
naiveHobo May 17, 2020
19c8c4f
Fix lint errors
naiveHobo May 17, 2020
e0d2305
Address reviewer's comments
naiveHobo May 19, 2020
ce4b7dc
Add tests
naiveHobo May 20, 2020
de0f797
Merge branch 'master' of github.com:ros-planning/navigation2 into fea…
naiveHobo May 27, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix lint errors
  • Loading branch information
@naiveHobo
naiveHobo committed May 19, 2020
commit 24d39bae2174a8d134351770651a2971d9123a6e
2 changes: 2 additions & 0 deletions nav2_behavior_tree/plugins/condition/distance_traveled_condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#ifndef NAV2_BEHAVIOR_TREE__DISTANCE_TRAVELED_CONDITION_HPP_
#define NAV2_BEHAVIOR_TREE__DISTANCE_TRAVELED_CONDITION_HPP_

#include <string>

#include "nav2_util/robot_utils.hpp"
#include "nav2_util/geometry_utils.hpp"

Expand Down
6 changes: 3 additions & 3 deletions nav2_behavior_tree/plugins/condition/distance_traveled_condition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__TRAVELED_CONDITION_HPP_
#define NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__TRAVELED_CONDITION_HPP_
#ifndef NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__DISTANCE_TRAVELED_CONDITION_HPP_
#define NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__DISTANCE_TRAVELED_CONDITION_HPP_

#include <string>
#include <memory>
Expand Down Expand Up @@ -61,4 +61,4 @@ class DistanceTraveledCondition : public BT::ConditionNode

} // namespace nav2_behavior_tree

#endif // NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__TRAVELED_CONDITION_HPP_
#endif // NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__DISTANCE_TRAVELED_CONDITION_HPP_
1 change: 1 addition & 0 deletions nav2_behavior_tree/plugins/condition/time_expired_condition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include <chrono>
#include <string>
#include <memory>

#include "behaviortree_cpp_v3/condition_node.h"

Expand Down
1 change: 1 addition & 0 deletions nav2_behavior_tree/plugins/condition/time_expired_condition.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#define NAV2_BEHAVIOR_TREE__PLUGINS__CONDITION__TIME_EXPIRED_CONDITION_HPP_

#include <chrono>
#include <string>

#include "behaviortree_cpp_v3/condition_node.h"

Expand Down