Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ ros2 launch aws_robomaker_racetrack_world view_racetrack.launch.py
```

# Robot Simulation
A good initial robot position near the start line is (2.75, -14.00, 0.0).
A good initial robot position near the start line is (2.75, -15.00, 0.2).

![Gazebo01](docs/images/turtlebot_burger.png)

Expand Down
17 changes: 0 additions & 17 deletions launch/racetrack.launch

This file was deleted.

35 changes: 17 additions & 18 deletions launch/racetrack.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,16 @@
import sys

import launch
from launch.conditions import IfCondition
from launch.substitutions import PythonExpression
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument
from ament_index_python.packages import get_package_share_directory


def generate_launch_description():

mode = launch.substitutions.LaunchConfiguration('mode')
world = os.path.join(get_package_share_directory('aws_robomaker_racetrack_world'), 'worlds')

mode = 'day' # Change mode
package_dir = get_package_share_directory('aws_robomaker_racetrack_world')
gazebo_ros = get_package_share_directory('gazebo_ros')

gazebo_client = launch.actions.IncludeLaunchDescription(
launch.launch_description_sources.PythonLaunchDescriptionSource(
os.path.join(gazebo_ros, 'launch', 'gzclient.launch.py')),
Expand All @@ -22,27 +21,27 @@ def generate_launch_description():
launch.launch_description_sources.PythonLaunchDescriptionSource(
os.path.join(gazebo_ros, 'launch', 'gzserver.launch.py'))
)
mode = launch.substitutions.LaunchConfiguration('mode')

ld = launch.LaunchDescription([
launch.actions.DeclareLaunchArgument(
return LaunchDescription([
DeclareLaunchArgument(
'world',
default_value=[PythonExpression(['"',world,'" + "/racetrack_" + "', mode, '" + ".world"']),''],
default_value=[os.path.join(package_dir, 'worlds', 'racetrack_' + mode + '.world'), ''],
description='SDF world file'),
launch.actions.DeclareLaunchArgument(
DeclareLaunchArgument(
name='gui',
default_value='false'
),
launch.actions.DeclareLaunchArgument(
name='mode',
default_value='night',
description='day or night modes are available'),
DeclareLaunchArgument(
name='use_sim_time',
default_value='true'
),
DeclareLaunchArgument('state',
default_value='true',
description='Set "true" to load "libgazebo_ros_state.so"'),
gazebo_server,
gazebo_client
gazebo_client,
])

return ld


if __name__ == '__main__':
generate_launch_description()
7 changes: 0 additions & 7 deletions launch/view_racetrack.launch

This file was deleted.

25 changes: 25 additions & 0 deletions launch/view_racetrack.launch.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import os
import sys

import launch
import launch_ros.actions
from ament_index_python.packages import get_package_share_directory


def generate_launch_description():
ld = launch.LaunchDescription([
launch.actions.IncludeLaunchDescription(
launch.launch_description_sources.PythonLaunchDescriptionSource(
[get_package_share_directory(
'aws_robomaker_racetrack_world'), '/launch/racetrack.launch.py']
),
launch_arguments={
'gui': 'true'
}.items()
)
])
return ld


if __name__ == '__main__':
generate_launch_description()