Skip to content

Commit b3474ca

Browse files
SteveMacenskict2034AlexeyMerzlyakovymd-stellahyunseok-yang
authored
[Humble] Sync 8 - Sept 25 (#3836)
* Same orientation of coordinate frames in rviz ang gazebo (#3751) * rviz view straight in default xy orientation Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> * gazebo orientation to match rviz Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> * rotating in direction of view --------- Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> * Fix flaky costmap filters tests: (#3754) 1. Set forward_prune_distance to 1.0 to robot not getting lost 2. Correct map name for costmap filter tests * Fix missing mutex in PlannerServer::isPathValid (#3756) Signed-off-by: ymd-stella <world.applepie@gmail.com> * Rewrite the scan topic costmap plugins for multi-robot(namespace) before launch navigation. (#3572) * Make it possible to launch namspaced robot which rewrites `<robot_namespace>` to namespace. - It allows to apply namespace automatically on specific target topic path in costmap plugins. Add new nav2 params file for multi-robot(rewriting `<robot_namespace>`) as an example. - nav2_multirobot_params_all.yaml Modify nav2_common.ReplaceString - add condition argument * Update nav2_bringup/launch/bringup_launch.py Co-authored-by: Steve Macenski <stevenmacenski@gmail.com> * Add new luanch script for multi-robot bringup Rename luanch script for multi-robot simulation bringup Add new nav2_common script - Parse argument - Parse multirobot pose Update README.md * Update README.md Apply suggestions from code review Fix pep257 erors Co-authored-by: Steve Macenski <stevenmacenski@gmail.com> --------- Co-authored-by: Steve Macenski <stevenmacenski@gmail.com> * use ros clock for wait (#3782) * use ROS clock for wait * fix backport issue --------- Co-authored-by: Guillaume Doisy <guillaume@dexory.com> * fixing external users of the BT action node template (#3792) * fixing external users of the BT action node template * Update nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp Co-authored-by: Guillaume Doisy <doisyg@users.noreply.github.com> --------- Co-authored-by: Guillaume Doisy <doisyg@users.noreply.github.com> * Using Simple Commander API for multi robot systems (#3803) * support multirobot namespaces * add docs * adding copy all params primitive for BT navigator (to ingest into rclcpp) (#3804) * adding copy all params primitive * fix linting * lint * I swear to god, this better be the last linting issue * allowing params to be declared from yaml * Update bt_navigator.cpp * some minor optimizations (#3821) * fix broken behaviortree doc link (#3822) Signed-off-by: Anton Kesy <antonkesy@gmail.com> * [MPPI] complete minor optimaization with floating point calculations (#3827) * floating point calculations * Update optimizer_unit_tests.cpp * Update critics_tests.cpp * Update critics_tests.cpp * 25% speed up of goal critic; 1% speed up from vy striding when not in use * bumping 1.1.9 to 1.1.10 for Humble release --------- Signed-off-by: Christian Henkel <christian.henkel2@de.bosch.com> Signed-off-by: ymd-stella <world.applepie@gmail.com> Signed-off-by: Anton Kesy <antonkesy@gmail.com> Co-authored-by: Christian Henkel <6976069+ct2034@users.noreply.github.com> Co-authored-by: Alexey Merzlyakov <60094858+AlexeyMerzlyakov@users.noreply.github.com> Co-authored-by: ymd-stella <7959916+ymd-stella@users.noreply.github.com> Co-authored-by: Hyunseok <yanghyunseok@me.com> Co-authored-by: Guillaume Doisy <doisyg@users.noreply.github.com> Co-authored-by: Guillaume Doisy <guillaume@dexory.com> Co-authored-by: Anton Kesy <antonkesy@gmail.com>
1 parent 9e63d43 commit b3474ca

File tree

79 files changed

+893
-162
lines changed

Some content is hidden

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

79 files changed

+893
-162
lines changed

nav2_amcl/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>nav2_amcl</name>
5-
<version>1.1.9</version>
5+
<version>1.1.10</version>
66
<description>
77
<p>
88
amcl is a probabilistic localization system for a robot moving in

nav2_behavior_tree/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ The BehaviorTree engine has a run method that accepts an XML description of a BT
6363
6464
See the code in the [BT Navigator](../nav2_bt_navigator/src/bt_navigator.cpp) for an example usage of the BehaviorTreeEngine.
6565
66-
For more information about the behavior tree nodes that are available in the default BehaviorTreeCPP library, see documentation here: https://www.behaviortree.dev/bt_basics/
66+
For more information about the behavior tree nodes that are available in the default BehaviorTreeCPP library, see documentation here: https://www.behaviortree.dev/docs/learn-the-basics/bt_basics/

nav2_behavior_tree/include/nav2_behavior_tree/bt_action_server_impl.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "nav2_msgs/action/navigate_to_pose.hpp"
2626
#include "nav2_behavior_tree/bt_action_server.hpp"
2727
#include "ament_index_cpp/get_package_share_directory.hpp"
28+
#include "nav2_util/node_utils.hpp"
2829

2930
namespace nav2_behavior_tree
3031
{
@@ -87,6 +88,17 @@ bool BtActionServer<ActionT>::on_configure()
8788
// Support for handling the topic-based goal pose from rviz
8889
client_node_ = std::make_shared<rclcpp::Node>("_", options);
8990

91+
// Declare parameters for common client node applications to share with BT nodes
92+
// Declare if not declared in case being used an external application, then copying
93+
// all of the main node's parameters to the client for BT nodes to obtain
94+
nav2_util::declare_parameter_if_not_declared(
95+
node, "global_frame", rclcpp::ParameterValue(std::string("map")));
96+
nav2_util::declare_parameter_if_not_declared(
97+
node, "robot_base_frame", rclcpp::ParameterValue(std::string("base_link")));
98+
nav2_util::declare_parameter_if_not_declared(
99+
node, "transform_tolerance", rclcpp::ParameterValue(0.1));
100+
nav2_util::copy_all_parameters(node, client_node_);
101+
90102
action_server_ = std::make_shared<ActionServer>(
91103
node->get_node_base_interface(),
92104
node->get_node_clock_interface(),

nav2_behavior_tree/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>nav2_behavior_tree</name>
5-
<version>1.1.9</version>
5+
<version>1.1.10</version>
66
<description>TODO</description>
77
<maintainer email="michael.jeronimo@intel.com">Michael Jeronimo</maintainer>
88
<maintainer email="carlos.a.orduno@intel.com">Carlos Orduno</maintainer>

nav2_behaviors/include/nav2_behaviors/plugins/wait.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class Wait : public TimedBehavior<WaitAction>
5353
Status onCycleUpdate() override;
5454

5555
protected:
56-
std::chrono::time_point<std::chrono::steady_clock> wait_end_;
56+
rclcpp::Time wait_end_;
5757
WaitAction::Feedback::SharedPtr feedback_;
5858
};
5959

nav2_behaviors/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>nav2_behaviors</name>
5-
<version>1.1.9</version>
5+
<version>1.1.10</version>
66
<description>TODO</description>
77
<maintainer email="carlos.a.orduno@intel.com">Carlos Orduno</maintainer>
88
<maintainer email="stevenmacenski@gmail.com">Steve Macenski</maintainer>

nav2_behaviors/plugins/wait.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@ Wait::~Wait() = default;
3030

3131
Status Wait::onRun(const std::shared_ptr<const WaitAction::Goal> command)
3232
{
33-
wait_end_ = std::chrono::steady_clock::now() +
34-
rclcpp::Duration(command->time).to_chrono<std::chrono::nanoseconds>();
33+
wait_end_ = node_.lock()->now() + rclcpp::Duration(command->time);
3534
return Status::SUCCEEDED;
3635
}
3736

3837
Status Wait::onCycleUpdate()
3938
{
40-
auto current_point = std::chrono::steady_clock::now();
41-
auto time_left =
42-
std::chrono::duration_cast<std::chrono::nanoseconds>(wait_end_ - current_point).count();
39+
auto current_point = node_.lock()->now();
40+
auto time_left = wait_end_ - current_point;
4341

44-
feedback_->time_left = rclcpp::Duration(rclcpp::Duration::from_nanoseconds(time_left));
42+
feedback_->time_left = time_left;
4543
action_server_->publish_feedback(feedback_);
4644

47-
if (time_left > 0) {
45+
if (time_left.nanoseconds() > 0) {
4846
return Status::RUNNING;
4947
} else {
5048
return Status::SUCCEEDED;

nav2_bringup/README.md

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,44 @@
11
# nav2_bringup
22

3-
The `nav2_bringup` package is an example bringup system for Nav2 applications.
3+
The `nav2_bringup` package is an example bringup system for Nav2 applications.
44

5-
This is a very flexible example for nav2 bringup that can be modified for different maps/robots/hardware/worlds/etc. It is our expectation for an application specific robot system that you're mirroring `nav2_bringup` package and modifying it for your specific maps/robots/bringup needs. This is an applied and working demonstration for the default system bringup with many options that can be easily modified.
5+
This is a very flexible example for nav2 bringup that can be modified for different maps/robots/hardware/worlds/etc. It is our expectation for an application specific robot system that you're mirroring `nav2_bringup` package and modifying it for your specific maps/robots/bringup needs. This is an applied and working demonstration for the default system bringup with many options that can be easily modified.
66

77
Usual robot stacks will have a `<robot_name>_nav` package with config/bringup files and this is that for the general case to base a specific robot system off of.
88

99
Dynamically composed bringup (based on [ROS2 Composition](https://docs.ros.org/en/galactic/Tutorials/Composition.html)) is optional for users. It can be used to compose all Nav2 nodes in a single process instead of launching these nodes separately, which is useful for embedded systems users that need to make optimizations due to harsh resource constraints. Dynamically composed bringup is used by default, but can be disabled by using the launch argument `use_composition:=False`.
1010

1111
* Some discussions about performance improvement of composed bringup could be found here: https://discourse.ros.org/t/nav2-composition/22175.
1212

13-
To use, please see the Nav2 [Getting Started Page](https://navigation.ros.org/getting_started/index.html) on our documentation website. Additional [tutorials will help you](https://navigation.ros.org/tutorials/index.html) go from an initial setup in simulation to testing on a hardware robot, using SLAM, and more.
13+
To use, please see the Nav2 [Getting Started Page](https://navigation.ros.org/getting_started/index.html) on our documentation website. Additional [tutorials will help you](https://navigation.ros.org/tutorials/index.html) go from an initial setup in simulation to testing on a hardware robot, using SLAM, and more.
1414

1515
Note:
1616
* gazebo should be started with both libgazebo_ros_init.so and libgazebo_ros_factory.so to work correctly.
1717
* spawn_entity node could not remap /tf and /tf_static to tf and tf_static in the launch file yet, used only for multi-robot situations. Instead it should be done as remapping argument <remapping>/tf:=tf</remapping> <remapping>/tf_static:=tf_static</remapping> under ros2 tag in each plugin which publishs transforms in the SDF file. It is essential to differentiate the tf's of the different robot.
18+
19+
## Launch
20+
21+
### Multi-robot Simulation
22+
23+
This is how to launch multi-robot simulation with simple command line. Please see the Nav2 documentation for further augments.
24+
25+
#### Cloned
26+
27+
This allows to bring up multiple robots, cloning a single robot N times at different positions in the map. The parameter are loaded from `nav2_multirobot_params_all.yaml` file by default.
28+
The multiple robots that consists of name and initial pose in YAML format will be set on the command-line. The format for each robot is `robot_name={x: 0.0, y: 0.0, yaw: 0.0, roll: 0.0, pitch: 0.0, yaw: 0.0}`.
29+
30+
Please refer to below examples.
31+
32+
```shell
33+
ros2 launch nav2_bringup cloned_multi_tb3_simulation_launch.py robots:="robot1={x: 1.0, y: 1.0, yaw: 1.5707}; robot2={x: 1.0, y: 1.0, yaw: 1.5707}"
34+
```
35+
36+
#### Unique
37+
38+
There are two robots including name and intitial pose are hard-coded in the launch script. Two separated unique robots are required params file (`nav2_multirobot_params_1.yaml`, `nav2_multirobot_params_2.yaml`) for each robot to bring up.
39+
40+
If you want to bringup more than two robots, you should modify the `unique_multi_tb3_simulation_launch.py` script.
41+
42+
```shell
43+
ros2 launch nav2_bringup unique_multi_tb3_simulation_launch.py
44+
```

nav2_bringup/launch/bringup_launch.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from launch_ros.actions import Node
2626
from launch_ros.actions import PushRosNamespace
2727
from launch_ros.descriptions import ParameterFile
28-
from nav2_common.launch import RewrittenYaml
28+
from nav2_common.launch import RewrittenYaml, ReplaceString
2929

3030

3131
def generate_launch_description():
@@ -59,6 +59,15 @@ def generate_launch_description():
5959
'use_sim_time': use_sim_time,
6060
'yaml_filename': map_yaml_file}
6161

62+
# Only it applys when `use_namespace` is True.
63+
# '<robot_namespace>' keyword shall be replaced by 'namespace' launch argument
64+
# in config file 'nav2_multirobot_params.yaml' as a default & example.
65+
# User defined config file should contain '<robot_namespace>' keyword for the replacements.
66+
params_file = ReplaceString(
67+
source_file=params_file,
68+
replacements={'<robot_namespace>': ('/', namespace)},
69+
condition=IfCondition(use_namespace))
70+
6271
configured_params = ParameterFile(
6372
RewrittenYaml(
6473
source_file=params_file,
Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
# Copyright (c) 2023 LG Electronics.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
16+
import os
17+
from ament_index_python.packages import get_package_share_directory
18+
from launch import LaunchDescription
19+
from launch.actions import (DeclareLaunchArgument, ExecuteProcess, GroupAction,
20+
IncludeLaunchDescription, LogInfo)
21+
from launch.conditions import IfCondition
22+
from launch.launch_description_sources import PythonLaunchDescriptionSource
23+
from launch.substitutions import LaunchConfiguration, TextSubstitution
24+
from nav2_common.launch import ParseMultiRobotPose
25+
26+
27+
def generate_launch_description():
28+
"""
29+
Bring up the multi-robots with given launch arguments.
30+
31+
Launch arguments consist of robot name(which is namespace) and pose for initialization.
32+
Keep general yaml format for pose information.
33+
ex) robots:="robot1={x: 1.0, y: 1.0, yaw: 1.5707}; robot2={x: 1.0, y: 1.0, yaw: 1.5707}"
34+
ex) robots:="robot3={x: 1.0, y: 1.0, z: 1.0, roll: 0.0, pitch: 1.5707, yaw: 1.5707};
35+
robot4={x: 1.0, y: 1.0, z: 1.0, roll: 0.0, pitch: 1.5707, yaw: 1.5707}"
36+
"""
37+
# Get the launch directory
38+
bringup_dir = get_package_share_directory('nav2_bringup')
39+
launch_dir = os.path.join(bringup_dir, 'launch')
40+
41+
# Simulation settings
42+
world = LaunchConfiguration('world')
43+
simulator = LaunchConfiguration('simulator')
44+
45+
# On this example all robots are launched with the same settings
46+
map_yaml_file = LaunchConfiguration('map')
47+
params_file = LaunchConfiguration('params_file')
48+
autostart = LaunchConfiguration('autostart')
49+
rviz_config_file = LaunchConfiguration('rviz_config')
50+
use_robot_state_pub = LaunchConfiguration('use_robot_state_pub')
51+
use_rviz = LaunchConfiguration('use_rviz')
52+
log_settings = LaunchConfiguration('log_settings', default='true')
53+
54+
# Declare the launch arguments
55+
declare_world_cmd = DeclareLaunchArgument(
56+
'world',
57+
default_value=os.path.join(bringup_dir, 'worlds', 'world_only.model'),
58+
description='Full path to world file to load')
59+
60+
declare_simulator_cmd = DeclareLaunchArgument(
61+
'simulator',
62+
default_value='gazebo',
63+
description='The simulator to use (gazebo or gzserver)')
64+
65+
declare_map_yaml_cmd = DeclareLaunchArgument(
66+
'map',
67+
default_value=os.path.join(bringup_dir, 'maps', 'turtlebot3_world.yaml'),
68+
description='Full path to map file to load')
69+
70+
declare_params_file_cmd = DeclareLaunchArgument(
71+
'params_file',
72+
default_value=os.path.join(bringup_dir, 'params', 'nav2_multirobot_params_all.yaml'),
73+
description='Full path to the ROS2 parameters file to use for all launched nodes')
74+
75+
declare_autostart_cmd = DeclareLaunchArgument(
76+
'autostart', default_value='false',
77+
description='Automatically startup the stacks')
78+
79+
declare_rviz_config_file_cmd = DeclareLaunchArgument(
80+
'rviz_config',
81+
default_value=os.path.join(bringup_dir, 'rviz', 'nav2_namespaced_view.rviz'),
82+
description='Full path to the RVIZ config file to use.')
83+
84+
declare_use_robot_state_pub_cmd = DeclareLaunchArgument(
85+
'use_robot_state_pub',
86+
default_value='True',
87+
description='Whether to start the robot state publisher')
88+
89+
declare_use_rviz_cmd = DeclareLaunchArgument(
90+
'use_rviz',
91+
default_value='True',
92+
description='Whether to start RVIZ')
93+
94+
# Start Gazebo with plugin providing the robot spawning service
95+
start_gazebo_cmd = ExecuteProcess(
96+
cmd=[simulator, '--verbose', '-s', 'libgazebo_ros_init.so',
97+
'-s', 'libgazebo_ros_factory.so', world],
98+
output='screen')
99+
100+
robots_list = ParseMultiRobotPose('robots').value()
101+
102+
# Define commands for launching the navigation instances
103+
bringup_cmd_group = []
104+
for robot_name in robots_list:
105+
init_pose = robots_list[robot_name]
106+
group = GroupAction([
107+
LogInfo(msg=['Launching namespace=', robot_name, ' init_pose=', str(init_pose)]),
108+
109+
IncludeLaunchDescription(
110+
PythonLaunchDescriptionSource(
111+
os.path.join(launch_dir, 'rviz_launch.py')),
112+
condition=IfCondition(use_rviz),
113+
launch_arguments={'namespace': TextSubstitution(text=robot_name),
114+
'use_namespace': 'True',
115+
'rviz_config': rviz_config_file}.items()),
116+
117+
IncludeLaunchDescription(
118+
PythonLaunchDescriptionSource(os.path.join(bringup_dir,
119+
'launch',
120+
'tb3_simulation_launch.py')),
121+
launch_arguments={'namespace': robot_name,
122+
'use_namespace': 'True',
123+
'map': map_yaml_file,
124+
'use_sim_time': 'True',
125+
'params_file': params_file,
126+
'autostart': autostart,
127+
'use_rviz': 'False',
128+
'use_simulator': 'False',
129+
'headless': 'False',
130+
'use_robot_state_pub': use_robot_state_pub,
131+
'x_pose': TextSubstitution(text=str(init_pose['x'])),
132+
'y_pose': TextSubstitution(text=str(init_pose['y'])),
133+
'z_pose': TextSubstitution(text=str(init_pose['z'])),
134+
'roll': TextSubstitution(text=str(init_pose['roll'])),
135+
'pitch': TextSubstitution(text=str(init_pose['pitch'])),
136+
'yaw': TextSubstitution(text=str(init_pose['yaw'])),
137+
'robot_name':TextSubstitution(text=robot_name), }.items())
138+
])
139+
140+
bringup_cmd_group.append(group)
141+
142+
# Create the launch description and populate
143+
ld = LaunchDescription()
144+
145+
# Declare the launch options
146+
ld.add_action(declare_simulator_cmd)
147+
ld.add_action(declare_world_cmd)
148+
ld.add_action(declare_map_yaml_cmd)
149+
ld.add_action(declare_params_file_cmd)
150+
ld.add_action(declare_use_rviz_cmd)
151+
ld.add_action(declare_autostart_cmd)
152+
ld.add_action(declare_rviz_config_file_cmd)
153+
ld.add_action(declare_use_robot_state_pub_cmd)
154+
155+
# Add the actions to start gazebo, robots and simulations
156+
ld.add_action(start_gazebo_cmd)
157+
158+
ld.add_action(LogInfo(msg=['number_of_robots=', str(len(robots_list))]))
159+
160+
ld.add_action(LogInfo(condition=IfCondition(log_settings),
161+
msg=['map yaml: ', map_yaml_file]))
162+
ld.add_action(LogInfo(condition=IfCondition(log_settings),
163+
msg=['params yaml: ', params_file]))
164+
ld.add_action(LogInfo(condition=IfCondition(log_settings),
165+
msg=['rviz config file: ', rviz_config_file]))
166+
ld.add_action(LogInfo(condition=IfCondition(log_settings),
167+
msg=['using robot state pub: ', use_robot_state_pub]))
168+
ld.add_action(LogInfo(condition=IfCondition(log_settings),
169+
msg=['autostart: ', autostart]))
170+
171+
for cmd in bringup_cmd_group:
172+
ld.add_action(cmd)
173+
174+
return ld

0 commit comments

Comments
 (0)