MISSIONS: various fixes for mil_missions integration

uf-mil · Jan 25, 2019 · d882b1e · d882b1e
1 parent fd79c3f
commit d882b1e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
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/legacy/rise_6dof/src/rise_6dof/controller.py b/legacy/rise_6dof/src/rise_6dof/controller.py
@@ -3,7 +3,7 @@
 import numpy
 
 from tf import transformations
-from sub8.pose_editor import quat_to_rotvec
+from mil_ros_tools.geometry_helpers import quat_to_rotvec
 
 numpy.set_printoptions(suppress=True, linewidth=130)
 

diff --git a/scripts/bash_aliases.sh b/scripts/bash_aliases.sh
@@ -15,8 +15,7 @@ alias rsub="ros_connect -n ${HOSTNAMES[0]}"
 alias sshsub="ssh sub8@${HOSTNAMES[0]} -Y"
 
 # Missions
-alias subm="rosrun sub8_missions run_mission"
-alias subc="rosrun sub8_missions move_command"
+alias submove="runmission Move"
 
 # Cameras
 alias subfps="rostopic hz $bag_front_cams $bag_down_cam"