Skip to content

Commit

Permalink
Merge pull request #2 from dgarcu/humble
Browse files Browse the repository at this point in the history
Added support for new world!
  • Loading branch information
jmguerreroh authored Apr 11, 2024
2 parents 844707a + dd295b2 commit 37b59a0
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 1 deletion.
4 changes: 4 additions & 0 deletions config/params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@
# aws_hospital - x: 0.0 - y: 1.0 - z: 0.0 - roll: 0.0 - pitch: 0.0 - yaw: 1.58
# aws_racetrack - x: 2.75 - y: -15.0 - z: 0.2 - roll: 0.0 - pitch: 0.0 - yaw: 0.0

# plasys worlds and recommended positions:
#
# plasys_house - x: -4.5 - y: -3.5 - z: 0.0 - roll: 0.0 - pitch: 0.0 - yaw: 2.35619

# Options:
# Tiago arm: no-arm - tiago-arm

Expand Down
9 changes: 9 additions & 0 deletions launch/simulation.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,15 @@ def generate_launch_description():
'launch'), '/view_bookstore.launch.py']),
)

# Specific path for plasys worlds
if "plasys" in world_name:
# Default: house
gazebo = IncludeLaunchDescription(
PythonLaunchDescriptionSource([os.path.join(
get_package_share_directory('plasys_house_world'),
'launch'), '/view_house.launch.py']),
)

tiago_state_publisher = include_launch_py_description(
'tiago_description',
['launch', 'robot_state_publisher.launch.py'])
Expand Down
Binary file added maps/plasys_house.pgm
Binary file not shown.
7 changes: 7 additions & 0 deletions maps/plasys_house.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image: plasys_house.pgm
mode: trinary
resolution: 0.05
origin: [-4.39, -13.1, 0]
negate: 0
occupied_thresh: 0.65
free_thresh: 0.25
6 changes: 5 additions & 1 deletion thirdparty.repos
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ repositories:
ThirdParty/aws-robomaker-small-warehouse-world:
type: git
url: https://github.com/aws-robotics/aws-robomaker-small-warehouse-world.git
version: ros2
version: ros2
ThirdParty/plasys_house_world:
type: git
url: https://github.com/dgarcu/plasys_house_world
version: master

0 comments on commit 37b59a0

Please sign in to comment.