Skip to content

Commit 63dd864

Browse files
committed
Merge remote-tracking branch 'origin/main' into (binary-filter)-change-boolean-ros-params
2 parents aa40776 + bf291d7 commit 63dd864

File tree

128 files changed

+2531
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+2531
-405
lines changed

.devcontainer/caddy/srv/nav2/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
For more related documentation:
1616

17-
- [Nav2 Documentation](https://navigation.ros.org)
18-
- [Development Guides](https://navigation.ros.org/development_guides)
19-
- [Dev Containers](https://navigation.ros.org/development_guides/devcontainer_docs)
17+
- [Nav2 Documentation](https://docs.nav2.org)
18+
- [Development Guides](https://docs.nav2.org/development_guides)
19+
- [Dev Containers](https://docs.nav2.org/development_guides/devcontainer_docs)
2020

2121
## Session Info
2222

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
-->
3939

4040
#### For Maintainers: <!-- DO NOT EDIT OR REMOVE -->
41-
- [ ] Check that any new parameters added are updated in navigation.ros.org
41+
- [ ] Check that any new parameters added are updated in docs.nav2.org
4242
- [ ] Check that any significant change is added to the migration guide
4343
- [ ] Check that any new features **OR** changes to existing behaviors are reflected in the tuning guide
4444
- [ ] Check that any new functions have Doxygen added

.github/mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ pull_request_rules:
8383
comment:
8484
message: |
8585
@{{author}}, please properly fill in PR template in the future. @stevemacenski, use this instead.
86-
- [ ] Check that any new parameters added are updated in navigation.ros.org
86+
- [ ] Check that any new parameters added are updated in docs.nav2.org
8787
- [ ] Check that any significant change is added to the migration guide
8888
- [ ] Check that any new features **OR** changes to existing behaviors are reflected in the tuning guide
8989
- [ ] Check that any new functions have Doxygen added

README.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
# Nav2
2-
[![GitHub Workflow Status](https://github.com/ros-planning/navigation2/actions/workflows/update_ci_image.yaml/badge.svg)](https://github.com/ros-planning/navigation2/actions/workflows/update_ci_image.yaml)
3-
[![codecov](https://codecov.io/gh/ros-planning/navigation2/branch/main/graph/badge.svg?token=S3iRmypwlg)](https://codecov.io/gh/ros-planning/navigation2)
2+
[![GitHub Workflow Status](https://github.com/ros-navigation/navigation2/actions/workflows/update_ci_image.yaml/badge.svg)](https://github.com/ros-navigation/navigation2/actions/workflows/update_ci_image.yaml)
3+
[![codecov](https://codecov.io/gh/ros-navigation/navigation2/branch/main/graph/badge.svg?token=S3iRmypwlg)](https://codecov.io/gh/ros-navigation/navigation2)
44

55
<p align="center">
66
<img height="300" src="doc/nav2_logo.png" />
77
</p>
88

99
For detailed instructions on how to:
10-
- [Getting Started](https://navigation.ros.org/getting_started/index.html)
11-
- [Concepts](https://navigation.ros.org/concepts/index.html)
12-
- [Build](https://navigation.ros.org/development_guides/build_docs/index.html#build)
13-
- [Install](https://navigation.ros.org/development_guides/build_docs/index.html#install)
14-
- [General Tutorials](https://navigation.ros.org/tutorials/index.html) and [Algorithm Developer Tutorials](https://navigation.ros.org/plugin_tutorials/index.html)
15-
- [Configure](https://navigation.ros.org/configuration/index.html)
16-
- [Navigation Plugins](https://navigation.ros.org/plugins/index.html)
17-
- [Migration Guides](https://navigation.ros.org/migration/index.html)
10+
- [Getting Started](https://docs.nav2.org/getting_started/index.html)
11+
- [Concepts](https://docs.nav2.org/concepts/index.html)
12+
- [Build](https://docs.nav2.org/development_guides/build_docs/index.html#build)
13+
- [Install](https://docs.nav2.org/development_guides/build_docs/index.html#install)
14+
- [General Tutorials](https://docs.nav2.org/tutorials/index.html) and [Algorithm Developer Tutorials](https://docs.nav2.org/plugin_tutorials/index.html)
15+
- [Configure](https://docs.nav2.org/configuration/index.html)
16+
- [Navigation Plugins](https://docs.nav2.org/plugins/index.html)
17+
- [Migration Guides](https://docs.nav2.org/migration/index.html)
1818
- [Container Images for Building Nav2](https://github.com/orgs/ros-planning/packages/container/package/navigation2)
19-
- [Contribute](https://navigation.ros.org/development_guides/involvement_docs/index.html)
19+
- [Contribute](https://docs.nav2.org/development_guides/involvement_docs/index.html)
2020

21-
Please visit our [documentation site](https://navigation.ros.org/). [Please visit our community Slack here](https://join.slack.com/t/navigation2/shared_invite/zt-hu52lnnq-cKYjuhTY~sEMbZXL8p9tOw) (if this link does not work, please contact maintainers to reactivate).
21+
Please visit our [documentation site](https://docs.nav2.org/). [Please visit our community Slack here](https://join.slack.com/t/navigation2/shared_invite/zt-hu52lnnq-cKYjuhTY~sEMbZXL8p9tOw) (if this link does not work, please contact maintainers to reactivate).
2222

2323
If you need professional services related to Nav2, please contact Open Navigation at [email protected].
2424

@@ -117,7 +117,7 @@ If you use the Regulated Pure Pursuit Controller algorithm or software from this
117117
| Service | Humble | Iron | Main |
118118
| :---: | :---: | :---: | :---: |
119119
| ROS Build Farm | [![Build Status](https://build.ros2.org/job/Hdev__navigation2__ubuntu_jammy_amd64/badge/icon)](https://build.ros2.org/job/Hdev__navigation2__ubuntu_jammy_amd64/) | [![Build Status](https://build.ros2.org/job/Idev__navigation2__ubuntu_jammy_amd64/badge/icon)](https://build.ros2.org/job/Idev__navigation2__ubuntu_jammy_amd64/) | N/A |
120-
| Circle CI | N/A | N/A | [![Build Status](https://circleci.com/gh/ros-planning/navigation2/tree/main.svg?style=svg)](https://circleci.com/gh/ros-planning/navigation2/tree/main) |
120+
| Circle CI | N/A | N/A | [![Build Status](https://circleci.com/gh/ros-navigation/navigation2/tree/main.svg?style=svg)](https://circleci.com/gh/ros-navigation/navigation2/tree/main) |
121121

122122

123123
| Package | Humble Source | Humble Debian | Iron Source | Iron Debian |

nav2_amcl/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# AMCL
22
Adaptive Monte Carlo Localization (AMCL) is a probabilistic localization module which estimates the position and orientation (i.e. Pose) of a robot in a given known map using a 2D laser scanner. This is largely a refactored port from ROS 1 without any algorithmic changes.
33

4-
See the [Configuration Guide Page](https://navigation.ros.org/configuration/packages/configuring-amcl.html) for more details about configurable settings and their meanings.
4+
See the [Configuration Guide Page](https://docs.nav2.org/configuration/packages/configuring-amcl.html) for more details about configurable settings and their meanings.

nav2_amcl/src/amcl_node.cpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#pragma GCC diagnostic pop
5050

5151
#include "nav2_amcl/portable_utils.hpp"
52+
#include "nav2_util/validate_messages.hpp"
5253

5354
using namespace std::placeholders;
5455
using rcl_interfaces::msg::ParameterType;
@@ -523,11 +524,8 @@ AmclNode::initialPoseReceived(geometry_msgs::msg::PoseWithCovarianceStamped::Sha
523524

524525
RCLCPP_INFO(get_logger(), "initialPoseReceived");
525526

526-
if (msg->header.frame_id == "") {
527-
// This should be removed at some point
528-
RCLCPP_WARN(
529-
get_logger(),
530-
"Received initial pose with empty frame_id. You should always supply a frame_id.");
527+
if (!nav2_util::validateMsg(*msg)) {
528+
RCLCPP_ERROR(get_logger(), "Received initialpose message is malformed. Rejecting.");
531529
return;
532530
}
533531
if (nav2_util::strip_leading_slash(msg->header.frame_id) != global_frame_id_) {
@@ -1390,6 +1388,10 @@ void
13901388
AmclNode::mapReceived(const nav_msgs::msg::OccupancyGrid::SharedPtr msg)
13911389
{
13921390
RCLCPP_DEBUG(get_logger(), "AmclNode: A new map was received.");
1391+
if (!nav2_util::validateMsg(*msg)) {
1392+
RCLCPP_ERROR(get_logger(), "Received map message is malformed. Rejecting.");
1393+
return;
1394+
}
13931395
if (first_map_only_ && first_map_received_) {
13941396
return;
13951397
}

nav2_amcl/src/pf/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ target_include_directories(pf_lib PRIVATE ../include)
1515
if(HAVE_DRAND48)
1616
target_compile_definitions(pf_lib PRIVATE "HAVE_DRAND48")
1717
endif()
18+
target_link_libraries(pf_lib m)
1819

1920
install(TARGETS
2021
pf_lib

nav2_behavior_tree/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ The nav2_behavior_tree module provides:
77
* Navigation-specific behavior tree nodes, and
88
* a generic BehaviorTreeEngine class that simplifies the integration of BT processing into ROS2 nodes for navigation or higher-level autonomy applications.
99

10-
See its [Configuration Guide Page](https://navigation.ros.org/configuration/packages/configuring-bt-xml.html) for additional parameter descriptions and a list of XML nodes made available in this package. Also review the [Nav2 Behavior Tree Explanation](https://navigation.ros.org/behavior_trees/index.html) pages explaining more context on the default behavior trees and examples provided in this package. A [tutorial](https://navigation.ros.org/plugin_tutorials/docs/writing_new_bt_plugin.html) is also provided to explain how to create a simple BT plugin.
10+
See its [Configuration Guide Page](https://docs.nav2.org/configuration/packages/configuring-bt-xml.html) for additional parameter descriptions and a list of XML nodes made available in this package. Also review the [Nav2 Behavior Tree Explanation](https://docs.nav2.org/behavior_trees/index.html) pages explaining more context on the default behavior trees and examples provided in this package. A [tutorial](https://docs.nav2.org/plugin_tutorials/docs/writing_new_bt_plugin.html) is also provided to explain how to create a simple BT plugin.
1111

12-
See the [Navigation Plugin list](https://navigation.ros.org/plugins/index.html) for a list of the currently known and available planner plugins.
12+
See the [Navigation Plugin list](https://docs.nav2.org/plugins/index.html) for a list of the currently known and available planner plugins.
1313

1414
## The bt_action_node Template and the Behavior Tree Engine
1515

nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ bool BtActionServer<ActionT>::on_configure()
144144
rclcpp::copy_all_parameter_values(node, client_node_);
145145

146146
// set the timeout in seconds for the action server to discard goal handles if not finished
147-
double action_server_result_timeout;
148-
node->get_parameter("action_server_result_timeout", action_server_result_timeout);
147+
double action_server_result_timeout =
148+
node->get_parameter("action_server_result_timeout").as_double();
149149
rcl_action_server_options_t server_options = rcl_action_server_get_default_options();
150150
server_options.result_timeout.nanoseconds = RCL_S_TO_NS(action_server_result_timeout);
151151

nav2_behavior_tree/plugins/decorator/path_longer_on_approach.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ bool PathLongerOnApproach::isPathUpdated(
3636
{
3737
return new_path != old_path && old_path.poses.size() != 0 &&
3838
new_path.poses.size() != 0 &&
39-
old_path.poses.back() == new_path.poses.back();
39+
old_path.poses.back().pose == new_path.poses.back().pose;
4040
}
4141

4242
bool PathLongerOnApproach::isRobotInGoalProximity(
@@ -62,12 +62,11 @@ inline BT::NodeStatus PathLongerOnApproach::tick()
6262
getInput("prox_len", prox_len_);
6363
getInput("length_factor", length_factor_);
6464

65-
if (!BT::isStatusActive(status())) {
66-
// Reset the starting point since we're starting a new iteration of
67-
// PathLongerOnApproach (moving from IDLE to RUNNING)
68-
first_time_ = true;
65+
if (first_time_ == false) {
66+
if (old_path_.poses.back() != new_path_.poses.back()) {
67+
first_time_ = true;
68+
}
6969
}
70-
7170
setStatus(BT::NodeStatus::RUNNING);
7271

7372
// Check if the path is updated and valid, compare the old and the new path length,

0 commit comments

Comments
 (0)