Merge pull request #375 from uf-mil/mil-missions

Use mil_missions
uf-mil · Jan 25, 2019 · abd6776 · abd6776
2 parents 8b3277c + d882b1e
commit abd6776
Show file tree

Hide file tree

Showing 41 changed files with 252 additions and 365 deletions.
diff --git a/command/sub8_launch/launch/mission_server.launch b/command/sub8_launch/launch/mission_server.launch
@@ -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>
diff --git a/command/sub8_launch/launch/sub8.launch b/command/sub8_launch/launch/sub8.launch
@@ -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>
diff --git a/command/sub8_missions/missions/__init__.py b/command/sub8_missions/missions/__init__.py
diff --git a/command/sub8_missions/missions/square.py b/command/sub8_missions/missions/square.py
diff --git a/command/sub8_missions/missions/surface.py b/command/sub8_missions/missions/surface.py
diff --git a/command/sub8_missions/nodes/list_missions b/command/sub8_missions/nodes/list_missions
diff --git a/command/sub8_missions/nodes/move_command b/command/sub8_missions/nodes/move_command
diff --git a/command/sub8_missions/nodes/run_mission b/command/sub8_missions/nodes/run_mission
diff --git a/command/sub8_missions/setup.py b/command/sub8_missions/setup.py
@@ -5,7 +5,7 @@
 
 # fetch values from package.xml
 setup_args = generate_distutils_setup(
-    packages=['sub8', 'missions'],
+    packages=['sub8_missions'],
 )
 
 setup(**setup_args)
diff --git a/command/sub8_missions/sub8/__init__.py b/command/sub8_missions/sub8/__init__.py
diff --git a/command/sub8_missions/sub8_missions/__init__.py b/command/sub8_missions/sub8_missions/__init__.py
@@ -0,0 +1,2 @@
+from sub_singleton import SubjuGator
+from move import Move
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		from sub_singleton import SubjuGator
		from move import Move