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.

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

Initial support to the new Gazebo #3634

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c52b2b0
Initial support to the new Gazebo
ahcorde Jun 16, 2023
fd50e02
Added feedback
ahcorde Jun 16, 2023
2500c8c
Fixed build
ahcorde Jun 19, 2023
5215768
Added feeback
ahcorde Jun 20, 2023
d3c421a
Fixed physics tag
ahcorde Jun 20, 2023
975bc78
Fixed physics tag
ahcorde Jun 20, 2023
469c2a2
Fix copyright and urdf
ahcorde Jun 20, 2023
34f466e
min range cannot be zero
ahcorde Jun 21, 2023
01babc9
Simplify files
ahcorde Jun 21, 2023
00b5885
Merge remote-tracking branch 'origin/main' into ahcorde/initial_suppo…
ahcorde Jun 23, 2023
792569a
Added feedback
ahcorde Jun 23, 2023
960fdd7
Added feedback
ahcorde Jun 26, 2023
5a3e06c
Fix
ahcorde Jun 28, 2023
b17def8
Try to reduce load
ahcorde Jul 3, 2023
b413994
Removed cast shadows
ahcorde Jul 17, 2023
ed65b71
Use Gazebo plugins instead of gz_ros2_control
ahcorde Jul 24, 2023
41d7f4e
update dependency
ahcorde Jul 24, 2023
9a36ecd
Removed dependency
ahcorde Jul 24, 2023
027f113
Merge remote-tracking branch 'origin/main' into ahcorde/initial_suppo…
ahcorde Oct 5, 2023
564cf39
Removed ros2_control and use ogre
ahcorde Oct 5, 2023
4b8b006
Merge remote-tracking branch 'origin/main' into ahcorde/initial_suppo…
ahcorde Nov 14, 2023
ddb760d
Use param file to configure bridge
ahcorde Nov 14, 2023
076f1f0
Use sdf model and change to ogre instead of ogre2 for sensors
azeey Dec 15, 2023
04912e6
Merge branch 'main' into support_gz-sim
azeey Dec 15, 2023
b2deaee
Support Garden and later, performance improvements
azeey Dec 20, 2023
43ef810
Merge pull request #1 from azeey/support_gz-sim
ahcorde Dec 28, 2023
1cc1474
Use xacro for world file (#2)
azeey Feb 15, 2024
6a462be
Reviewer feedback
azeey Feb 17, 2024
225f1f3
Add comment explaining temp file
azeey Feb 17, 2024
1d8634d
Fix linter
azeey Feb 17, 2024
5bf14e2
Merge branch 'main' into ahcorde/initial_support/gazebo
SteveMacenski May 28, 2024
cc5bde0
Update nav2_bringup/worlds/gz_world_only.sdf.xacro
SteveMacenski May 28, 2024
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
106 changes: 106 additions & 0 deletions nav2_bringup/launch/tb3_gz_robot_launch.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
# Copyright (C) 2023 Open Source Robotics Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import os

from ament_index_python.packages import get_package_share_directory

from launch import LaunchDescription
from launch.actions import AppendEnvironmentVariable
from launch.actions import DeclareLaunchArgument
from launch.conditions import IfCondition
from launch.substitutions import LaunchConfiguration

from launch_ros.actions import Node


def generate_launch_description():
bringup_dir = get_package_share_directory('nav2_bringup')

namespace = LaunchConfiguration('namespace')
use_simulator = LaunchConfiguration('use_simulator')
robot_name = LaunchConfiguration('robot_name')
robot_sdf = LaunchConfiguration('robot_sdf')
pose = {'x': LaunchConfiguration('x_pose', default='-2.00'),
'y': LaunchConfiguration('y_pose', default='-0.50'),
'z': LaunchConfiguration('z_pose', default='0.01'),
'R': LaunchConfiguration('roll', default='0.00'),
'P': LaunchConfiguration('pitch', default='0.00'),
'Y': LaunchConfiguration('yaw', default='0.00')}

# Declare the launch arguments
declare_namespace_cmd = DeclareLaunchArgument(
'namespace',
default_value='',
description='Top-level namespace')

declare_use_simulator_cmd = DeclareLaunchArgument(
'use_simulator',
default_value='True',
description='Whether to start the simulator')

declare_robot_name_cmd = DeclareLaunchArgument(
'robot_name',
default_value='turtlebot3_waffle',
description='name of the robot')

declare_robot_sdf_cmd = DeclareLaunchArgument(
'robot_sdf',
default_value=os.path.join(bringup_dir, 'worlds', 'gz_waffle.sdf'),
description='Full path to robot sdf file to spawn the robot in gazebo')

pkg_nav2_bringup = get_package_share_directory('nav2_bringup')
bridge = Node(
Copy link
Member

@SteveMacenski SteveMacenski Feb 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this bridge also be namespaced for namespacing the topics?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what you mean. The topics in the Gazebo classic model are not namespaced (e.g., Laser scan is published on /scan).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not when we launch using the namespace, then multiple robots are possible to be simulated and it publishes to namespace/scan -- see the multi-robot launch files in this same directory (unique [which are N unique robots] / clone [which are N of the same robot]). So, I'd think the bridge would need to have the namespace applied to have the topic broadcast on the set namespace, no?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I wasn't aware of the multi-robot launch files. I think the bridge and the sdf files need to be reworked to support multiple robots. Just adding the namespace here won't be enough since the gz-transport topics also need to be "namespaced". The turtlebot3_waffle_bridge.yaml file will also have to become some sort of template so we can inject the robot name.

Also, those multirobot launch files refer to the Gazebo classic based launch files. Should we copy them for the modern Gazebo versions?

I probably won't be able to get to this till later next week.

package='ros_gz_bridge',
executable='parameter_bridge',
parameters=[
{
'config_file': os.path.join(
pkg_nav2_bringup, 'params', 'turtlebot3_waffle_bridge.yaml'
),
}
],
output='screen',
)

spawn_model = Node(
condition=IfCondition(use_simulator),
package='ros_gz_sim',
executable='create',
output='screen',
arguments=[
'-entity', robot_name,
'-file', robot_sdf,
'-robot_namespace', namespace,
'-x', pose['x'], '-y', pose['y'], '-z', pose['z'],
'-R', pose['R'], '-P', pose['P'], '-Y', pose['Y']]
)

set_env_vars_resources = AppendEnvironmentVariable(
'GZ_SIM_RESOURCE_PATH',
os.path.join(get_package_share_directory('turtlebot3_gazebo'),
'models'))

# Create the launch description and populate
ld = LaunchDescription()
ld.add_action(declare_namespace_cmd)
ld.add_action(declare_robot_name_cmd)
ld.add_action(declare_robot_sdf_cmd)
ld.add_action(declare_use_simulator_cmd)

ld.add_action(set_env_vars_resources)

ld.add_action(bridge)
ld.add_action(spawn_model)
return ld
Loading
Loading