Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use mil_missions #375

Merged
merged 5 commits into from
Jan 25, 2019
Merged
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
6 changes: 6 additions & 0 deletions command/sub8_launch/launch/mission_server.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<launch>
<node pkg="mil_missions" type="mission_server" name="mission_server">
<param name="missions_module" value="sub8_missions" />
<param name="base_mission" value="SubjuGator" />
</node>
</launch>
1 change: 1 addition & 0 deletions command/sub8_launch/launch/sub8.launch
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@
<include file="$(find sub8_launch)/launch/subsystems/rise.launch"/>
<include file="$(find sub8_launch)/launch/subsystems/online_bagger.launch"/>
<include file="$(find sub8_alarm)/launch/alarms.launch" />
<include file="$(find sub8_launch)/launch/mission_server.launch" />
</launch>
8 changes: 0 additions & 8 deletions command/sub8_missions/missions/__init__.py

This file was deleted.

23 changes: 0 additions & 23 deletions command/sub8_missions/missions/square.py

This file was deleted.

8 changes: 0 additions & 8 deletions command/sub8_missions/missions/surface.py

This file was deleted.

10 changes: 0 additions & 10 deletions command/sub8_missions/nodes/list_missions

This file was deleted.

171 changes: 0 additions & 171 deletions command/sub8_missions/nodes/move_command

This file was deleted.

95 changes: 0 additions & 95 deletions command/sub8_missions/nodes/run_mission

This file was deleted.

2 changes: 1 addition & 1 deletion command/sub8_missions/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# fetch values from package.xml
setup_args = generate_distutils_setup(
packages=['sub8', 'missions'],
packages=['sub8_missions'],
)

setup(**setup_args)
7 changes: 0 additions & 7 deletions command/sub8_missions/sub8/__init__.py

This file was deleted.

2 changes: 2 additions & 0 deletions command/sub8_missions/sub8_missions/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from sub_singleton import SubjuGator
from move import Move
Loading