Skip to content

Commit 25dd1e5

Browse files
Merge branch 'simulation-enhancement' of https://github.com/CWRUbotix/rov-25 into simulation-enhancement
2 parents b3c2dba + 5f2a56c commit 25dd1e5

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

src/surface/rov_gazebo/launch/sim_launch.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ def generate_launch_description() -> LaunchDescription:
2020
params_path = str(Path(rov_gazebo_path) / 'config' / params_file)
2121

2222
# TODO: gz_sim launch might be nice
23-
start_gazebo = ExecuteProcess(
24-
cmd=['gz', 'sim', '-v', '3', '-r', world_path], output='screen'
25-
)
23+
start_gazebo = ExecuteProcess(cmd=['gz', 'sim', '-v', '3', '-r', world_path], output='screen')
2624

2725
start_ardusub = ExecuteProcess(
2826
cmd=['ardusub', '-S', '-w', '-M', 'JSON', '--defaults', params_path, '-I0'], output='screen'

src/surface/rov_gazebo/models/props/brain_coral/model.sdf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<sdf version="1.6">
33
<model name="brain_coral">
44
<pose>0 0 0 0 0 0</pose>
5-
5+
66

77
<link name="base_link">
88
<pose>0 0 0 0 0 0</pose>
@@ -28,6 +28,6 @@
2828
</geometry>
2929
</collision>
3030
</link>
31-
31+
3232
</model>
3333
</sdf>

src/surface/rov_gazebo/models/props/coral_nursery_base/model.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
</visual>
1616

1717
</link>
18-
18+
1919
</model>
2020
</sdf>

src/surface/rov_gazebo/models/props/coral_restoration_area/model.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
</geometry>
2323
</collision> -->
2424
</link>
25-
25+
2626
</model>
2727
</sdf>

src/surface/rov_gazebo/models/rov24_with_brain_coral/model.sdf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<uri>model://rov24</uri>
66
</include>
77

8-
<include>
8+
<include>
99
<uri>model://brain_coral</uri>
1010
<pose>0.275 -0.135 -0.085 0 0 -0.7854</pose>
1111
</include>

0 commit comments

Comments
 (0)