Skip to content

Commit 1f980a1

Browse files
authored
Make rviz use sim time with TB3 demo (ros-navigation#4274)
Signed-off-by: Tony Najjar <tony.najjar.1997@gmail.com>
1 parent fbec0fa commit 1f980a1

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

nav2_bringup/launch/rviz_launch.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ def generate_launch_description():
3434
namespace = LaunchConfiguration('namespace')
3535
use_namespace = LaunchConfiguration('use_namespace')
3636
rviz_config_file = LaunchConfiguration('rviz_config')
37+
use_sim_time = LaunchConfiguration('use_sim_time')
3738

3839
# Declare the launch arguments
3940
declare_namespace_cmd = DeclareLaunchArgument(
@@ -57,13 +58,19 @@ def generate_launch_description():
5758
description='Full path to the RVIZ config file to use',
5859
)
5960

61+
declare_use_sim_time_cmd = DeclareLaunchArgument(
62+
'use_sim_time',
63+
default_value='false',
64+
description='Use simulation (Gazebo) clock if true')
65+
6066
# Launch rviz
6167
start_rviz_cmd = Node(
6268
condition=UnlessCondition(use_namespace),
6369
package='rviz2',
6470
executable='rviz2',
6571
arguments=['-d', rviz_config_file],
6672
output='screen',
73+
parameters=[{'use_sim_time': use_sim_time}],
6774
)
6875

6976
namespaced_rviz_config_file = ReplaceString(
@@ -77,6 +84,7 @@ def generate_launch_description():
7784
executable='rviz2',
7885
namespace=namespace,
7986
arguments=['-d', namespaced_rviz_config_file],
87+
parameters=[{'use_sim_time': use_sim_time}],
8088
output='screen',
8189
remappings=[
8290
('/map', 'map'),
@@ -111,6 +119,7 @@ def generate_launch_description():
111119
ld.add_action(declare_namespace_cmd)
112120
ld.add_action(declare_use_namespace_cmd)
113121
ld.add_action(declare_rviz_config_file_cmd)
122+
ld.add_action(declare_use_sim_time_cmd)
114123

115124
# Add any conditioned actions
116125
ld.add_action(start_rviz_cmd)

nav2_bringup/launch/tb3_simulation_launch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ def generate_launch_description():
242242
launch_arguments={
243243
'namespace': namespace,
244244
'use_namespace': use_namespace,
245+
'use_sim_time': use_sim_time,
245246
'rviz_config': rviz_config_file,
246247
}.items(),
247248
)

0 commit comments

Comments
 (0)