Skip to content

Commit aa40776

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

File tree

587 files changed

+18156
-5416
lines changed

Some content is hidden

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

587 files changed

+18156
-5416
lines changed

.circleci/config.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ _commands:
3333
- restore_cache:
3434
name: Restore Cache << parameters.key >>
3535
keys:
36-
- "<< parameters.key >>-v16\
36+
- "<< parameters.key >>-v21\
3737
-{{ arch }}\
3838
-{{ .Branch }}\
3939
-{{ .Environment.CIRCLE_PR_NUMBER }}\
4040
-{{ checksum \"<< parameters.workspace >>/lockfile.txt\" }}"
41-
- "<< parameters.key >>-v16\
41+
- "<< parameters.key >>-v21\
4242
-{{ arch }}\
4343
-main\
4444
-<no value>\
@@ -58,7 +58,7 @@ _commands:
5858
steps:
5959
- save_cache:
6060
name: Save Cache << parameters.key >>
61-
key: "<< parameters.key >>-v16\
61+
key: "<< parameters.key >>-v21\
6262
-{{ arch }}\
6363
-{{ .Branch }}\
6464
-{{ .Environment.CIRCLE_PR_NUMBER }}\
@@ -96,6 +96,11 @@ _commands:
9696
(echo vcs_export && cat) >> lockfile.txt
9797
sha256sum $PWD/lockfile.txt >> lockfile.txt
9898
99+
# Temp: Rolling transition to 24.04 leaves rosdep in 22.04 in the lurch
100+
# This replaces main rosdep index with the last prior to release: Feb 28, 2024
101+
sed -i "s|ros\/rosdistro\/master|ros\/rosdistro\/rolling\/2024-02-28|" /etc/ros/rosdep/sources.list.d/20-default.list
102+
export ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/rolling/2024-02-28/index-v4.yaml
103+
99104
apt-get update
100105
rosdep update --rosdistro $ROS_DISTRO
101106
dependencies=$(

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
| Ticket(s) this addresses | (add tickets here #1) |
1010
| Primary OS tested on | (Ubuntu, MacOS, Windows) |
1111
| Robotic platform tested on | (Steve's Robot, gazebo simulation of Tally, hardware turtlebot) |
12+
| Does this PR contain AI generated software? | (No; Yes and it is marked inline in the code) |
1213

1314
---
1415

.github/workflows/lint.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Lint
2+
on:
3+
pull_request:
4+
5+
jobs:
6+
ament_lint_general:
7+
name: ament_${{ matrix.linter }}
8+
runs-on: ubuntu-latest
9+
container:
10+
image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
linter: [xmllint, cpplint, uncrustify, pep257, flake8]
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: ros-tooling/[email protected]
18+
with:
19+
linter: ${{ matrix.linter }}
20+
distribution: rolling
21+
package-name: "*"

.github/workflows/update_ci_image.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ jobs:
6565
steps:
6666
- uses: actions/checkout@v4
6767
- name: Set up Docker Buildx
68-
uses: docker/setup-buildx-action@v2
68+
uses: docker/setup-buildx-action@v3
6969
- name: Login to Docker Hub
70-
uses: docker/login-action@v2
70+
uses: docker/login-action@v3
7171
with:
7272
registry: ghcr.io
7373
username: ${{ github.repository_owner }}
@@ -99,7 +99,7 @@ jobs:
9999
- name: Build and push ${{ github.ref_name }}
100100
if: steps.config.outputs.trigger == 'true'
101101
id: docker_build
102-
uses: docker/build-push-action@v4
102+
uses: docker/build-push-action@v5
103103
with:
104104
context: .
105105
pull: true

CONTRIBUTING.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Any contribution that you make to this repository will
2+
be under the Apache 2 License, as dictated by that
3+
[license](http://www.apache.org/licenses/LICENSE-2.0.html):
4+
5+
~~~
6+
5. Submission of Contributions. Unless You explicitly state otherwise,
7+
any Contribution intentionally submitted for inclusion in the Work
8+
by You to the Licensor shall be under the terms and conditions of
9+
this License, without any additional terms or conditions.
10+
Notwithstanding the above, nothing herein shall supersede or modify
11+
the terms of any separate license agreement you may have executed
12+
with Licensor regarding such Contributions.
13+
~~~
14+
15+
Contributors must sign-off each commit by adding a `Signed-off-by: ...`
16+
line to commit messages to certify that they have the right to submit
17+
the code they are contributing to the project according to the
18+
[Developer Certificate of Origin (DCO)](https://developercertificate.org/).

README.md

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
For detailed instructions on how to:
1010
- [Getting Started](https://navigation.ros.org/getting_started/index.html)
1111
- [Concepts](https://navigation.ros.org/concepts/index.html)
12-
- [Build](https://navigation.ros.org/build_instructions/index.html#build)
13-
- [Install](https://navigation.ros.org/build_instructions/index.html#install)
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)
1414
- [General Tutorials](https://navigation.ros.org/tutorials/index.html) and [Algorithm Developer Tutorials](https://navigation.ros.org/plugin_tutorials/index.html)
1515
- [Configure](https://navigation.ros.org/configuration/index.html)
1616
- [Navigation Plugins](https://navigation.ros.org/plugins/index.html)
@@ -20,16 +20,20 @@ For detailed instructions on how to:
2020

2121
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).
2222

23+
If you need professional services related to Nav2, please contact Open Navigation at [email protected].
24+
2325
## Our Sponsors
2426

2527
Please thank our amazing sponsors for their generous support of Nav2 on behalf of the community to allow the project to continue to be professionally maintained, developed, and supported for the long-haul! [Open Navigation LLC](https://www.opennav.org/) provides project leadership, maintenance, development, and support services to the Nav2 & ROS community.
2628

2729
<p align="center">
28-
<img src="doc/sponsors_may_2023.png" />
30+
<img src="doc/sponsors_feb_2024.png" />
2931
</p>
3032

3133
### [Dexory](https://www.dexory.com/) develops robotics and AI logistics solutions to drive better business decisions using a digital twin of warehouses to provide inventory insights.
3234

35+
### [Nvidia](https://www.nvidia.com/en-us/deep-learning-ai/industries/robotics/) develops GPU and AI technologies that power modern robotics, autonomous driving, data centers, gaming, and more.
36+
3337
### [Polymath Robotics](https://www.polymathrobotics.com/) creates safety-critical navigation systems for industrial vehicles that are radically simple to enable and deploy.
3438

3539
### [Stereolabs](https://www.stereolabs.com/) produces the high-quality ZED stereo cameras with a complete vision pipeline from neural depth to SLAM, 3D object tracking, AI and more.
@@ -68,6 +72,19 @@ If you use **any** of the algorithms in Nav2 or the analysis of the algorithms i
6872
}
6973
```
7074

75+
If you use the Smac Planner (Hybrid A*, State Lattice, 2D), please cite this work in your papers!
76+
77+
- S. Macenski, M. Booker, J. Wallace, [**Open-Source, Cost-Aware Kinematically Feasible Planning for Mobile and Surface Robotics**](https://arxiv.org/abs/2401.13078). 2024.
78+
79+
```bibtex
80+
@article{macenski2024smac,
81+
title={Open-Source, Cost-Aware Kinematically Feasible Planning for Mobile and Surface Robotics},
82+
author={Steve Macenski and Matthew Booker and Josh Wallace},
83+
year={2024},
84+
journal = {Arxiv}
85+
}
86+
```
87+
7188
If you use the Regulated Pure Pursuit Controller algorithm or software from this repository, please cite this work in your papers!
7289

7390
- S. Macenski, S. Singh, F. Martin, J. Gines, [**Regulated Pure Pursuit for Robot Path Tracking**](https://arxiv.org/abs/2305.20026). Autonomous Robots, 2023.

doc/sponsors_feb_2024.png

183 KB
Loading

doc/sponsors_jan_2024.png

180 KB
Loading

nav2_amcl/include/nav2_amcl/amcl_node.hpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "nav2_amcl/sensors/laser/laser.hpp"
3636
#include "nav2_msgs/msg/particle.hpp"
3737
#include "nav2_msgs/msg/particle_cloud.hpp"
38+
#include "nav2_msgs/srv/set_initial_pose.hpp"
3839
#include "nav_msgs/srv/set_map.hpp"
3940
#include "sensor_msgs/msg/laser_scan.hpp"
4041
#include "std_srvs/srv/empty.hpp"
@@ -210,6 +211,16 @@ class AmclNode : public nav2_util::LifecycleNode
210211
const std::shared_ptr<std_srvs::srv::Empty::Request> request,
211212
std::shared_ptr<std_srvs::srv::Empty::Response> response);
212213

214+
// service server for providing an initial pose guess
215+
rclcpp::Service<nav2_msgs::srv::SetInitialPose>::SharedPtr initial_guess_srv_;
216+
/*
217+
* @brief Service callback for an initial pose guess request
218+
*/
219+
void initialPoseReceivedSrv(
220+
const std::shared_ptr<rmw_request_id_t> request_header,
221+
const std::shared_ptr<nav2_msgs::srv::SetInitialPose::Request> request,
222+
std::shared_ptr<nav2_msgs::srv::SetInitialPose::Response> response);
223+
213224
// Let amcl update samples without requiring motion
214225
rclcpp::Service<std_srvs::srv::Empty>::SharedPtr nomotion_update_srv_;
215226
/*

nav2_amcl/include/nav2_amcl/pf/pf_vector.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ typedef struct
4949

5050

5151
// Return a zero vector
52-
pf_vector_t pf_vector_zero();
52+
pf_vector_t pf_vector_zero(void);
5353

5454
// Check for NAN or INF in any component
5555
// int pf_vector_finite(pf_vector_t a);
@@ -71,7 +71,7 @@ pf_vector_t pf_vector_coord_add(pf_vector_t a, pf_vector_t b);
7171

7272

7373
// Return a zero matrix
74-
pf_matrix_t pf_matrix_zero();
74+
pf_matrix_t pf_matrix_zero(void);
7575

7676
// Check for NAN or INF in any component
7777
// int pf_matrix_finite(pf_matrix_t a);

0 commit comments

Comments
 (0)