Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
24f5b73
bridge wayfinding task topics, merge competition launch files
iche033 Sep 30, 2022
962ecb1
add station keeping world
iche033 Sep 30, 2022
d40a471
rename to stationkeeping_task
iche033 Sep 30, 2022
23f4e2e
one more rename
iche033 Sep 30, 2022
c2a3289
add urdf files
iche033 Oct 4, 2022
a9b8e8f
updating plugins
iche033 Oct 4, 2022
9bb7128
porting generate_wamv script
iche033 Oct 5, 2022
6246276
add conf, fix generate wamv launch and configure script
iche033 Oct 5, 2022
bd4aa07
wamv gen working
iche033 Oct 5, 2022
9142b9e
cleanup, contact sensor working, locked mode working
iche033 Oct 6, 2022
b3054d8
fix thruster gen
iche033 Oct 6, 2022
b11a738
add sensor models
iche033 Oct 6, 2022
25fe011
merge from gazebosim
iche033 Oct 6, 2022
a098839
setting up bridges
iche033 Oct 7, 2022
a30fd25
fix lidar and tf
iche033 Oct 7, 2022
8e41933
remove unused config files
iche033 Oct 7, 2022
18fef8e
remove old generate launch file
iche033 Oct 7, 2022
4820baf
comment out debug print
iche033 Oct 7, 2022
2491416
odom working
iche033 Oct 7, 2022
374b138
cleanup compliance file
iche033 Oct 7, 2022
8769f0b
comment out xacro_add_files
iche033 Oct 10, 2022
b421c87
update ros topic names
iche033 Oct 12, 2022
af5941c
update ros topic names for optical nodes
iche033 Oct 12, 2022
00e836a
rm wamv config and launch dir
iche033 Oct 12, 2022
d4702a8
update cmake
iche033 Oct 12, 2022
b39b960
Merge branch 'gazebosim' into iche033/wamv_config
iche033 Oct 13, 2022
c370dd9
add navsat to wildlife world
iche033 Oct 13, 2022
86fa7fe
default to sensors enabled, locked, and H thruster_config
iche033 Oct 13, 2022
eeee138
[Garden] Port Ball Shooter plugin (#529)
iche033 Oct 25, 2022
5d380c4
Merge from gazebosim
caguero Nov 1, 2022
23c134e
[Garden] Port Placard plugin (#532)
iche033 Nov 2, 2022
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
4 changes: 3 additions & 1 deletion vrx_gz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,11 @@ install(
# Plugins
list(APPEND VRX_GZ_PLUGINS
AcousticPingerPlugin
BallShooterPlugin
LightBuoyPlugin
PerceptionScoringPlugin
NavigationScoringPlugin
PerceptionScoringPlugin
PlacardPlugin
SimpleHydrodynamics
StationkeepingScoringPlugin
Surface
Expand Down
7 changes: 7 additions & 0 deletions vrx_gz/launch/competition.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def launch(context, *args, **kwargs):
'bridge_competition_topics').perform(context).lower() == 'true'
robot = LaunchConfiguration('robot').perform(context)
headless = LaunchConfiguration('headless').perform(context).lower() == 'true'
robot_urdf = LaunchConfiguration('urdf').perform(context)

launch_processes = []

Expand All @@ -39,6 +40,8 @@ def launch(context, *args, **kwargs):
models = Model.FromConfig(stream)
else:
m = Model('wamv', 'wam-v', [-532, 162, 0, 0, 0, 1])
if robot_urdf and robot_urdf != '':
m.set_urdf(robot_urdf)
models.append(m)

launch_processes.extend(vrx_gz.launch.simulation(world_name, headless))
Expand Down Expand Up @@ -81,5 +84,9 @@ def generate_launch_description():
'headless',
default_value='False',
description='True to run simulation headless (no GUI). '),
DeclareLaunchArgument(
'urdf',
default_value='',
description='URDF file of the wam-v model. '),
OpaqueFunction(function=launch),
])
15 changes: 15 additions & 0 deletions vrx_gz/models/dock_2022/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<model>
<name>robotx_dock_2022</name>
<version>1.0</version>
<sdf version="1.6">model.sdf</sdf>

<author>
<name>Carlos Agüero</name>
<email>caguero@openrobotics.org</email>
</author>

<description>
The dock used in RobotX 2022.
</description>
</model>
Loading