From 4cca380d93c1e2f8af09233ac883d7cafcaadfab Mon Sep 17 00:00:00 2001
From: Kevin Allen <kma1660@gmail.com>
Date: Mon, 10 Apr 2017 20:08:31 -0400
Subject: [PATCH] MIL COMMON: move remaining sub8_tool includes to mil_common

---
 command/sub8_launch/nodes/self_check.py      | 2 +-
 command/sub8_missions/missions/autonomous.py | 2 +-
 command/sub8_missions/nodes/move_command     | 4 ++--
 command/sub8_missions/nodes/run_mission      | 4 ++--
 command/sub8_missions/sub8/sub_singleton.py  | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/command/sub8_launch/nodes/self_check.py b/command/sub8_launch/nodes/self_check.py
index f0b994f7..ab4515ca 100755
--- a/command/sub8_launch/nodes/self_check.py
+++ b/command/sub8_launch/nodes/self_check.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 import txros
-from sub8_tools import text_effects
+from mil_misc_tools import text_effects
 from twisted.internet import defer, reactor
 import sys
 
diff --git a/command/sub8_missions/missions/autonomous.py b/command/sub8_missions/missions/autonomous.py
index 79e90779..99a5894d 100644
--- a/command/sub8_missions/missions/autonomous.py
+++ b/command/sub8_missions/missions/autonomous.py
@@ -1,7 +1,7 @@
 import txros
 from twisted.internet import defer
 from ros_alarms import TxAlarmListener, TxAlarmBroadcaster
-from sub8_tools import text_effects 
+from mil_misc_tools import text_effects 
 
 # Import missions here
 import square
diff --git a/command/sub8_missions/nodes/move_command b/command/sub8_missions/nodes/move_command
index 8d4c64a8..8216fbb5 100755
--- a/command/sub8_missions/nodes/move_command
+++ b/command/sub8_missions/nodes/move_command
@@ -3,7 +3,7 @@ from txros import util, NodeHandle
 from twisted.internet import defer, reactor
 
 import numpy as np
-import sub8_tools
+from mil_misc_tools import text_effects
 from sub8 import sub_singleton
 from geometry_msgs.msg import PoseStamped, PointStamped
 import missions
@@ -15,7 +15,7 @@ SHORTHAND = {"f": "forward", "b": "backward", "l": "left", "r": "right", "yl": "
              "d": "down", "u": "up"}
 
 ros_t = lambda d: util.genpy.Duration(d)
-fprint = sub8_tools.text_effects.FprintFactory(title="MOVE_COMMAND").fprint
+fprint = text_effects.FprintFactory(title="MOVE_COMMAND").fprint
 
 @util.cancellableInlineCallbacks
 def main(args):
diff --git a/command/sub8_missions/nodes/run_mission b/command/sub8_missions/nodes/run_mission
index f16607cd..8cc893ae 100755
--- a/command/sub8_missions/nodes/run_mission
+++ b/command/sub8_missions/nodes/run_mission
@@ -6,12 +6,12 @@ import argparse
 from twisted.internet import defer, reactor
 import exceptions
 import txros
-import sub8_tools
+from mil_misc_tools import text_effects
 from sub8 import sub_singleton
 import missions
 
 
-fprint = sub8_tools.text_effects.FprintFactory(title="MISSION_RUNNER").fprint
+fprint = text_effects.FprintFactory(title="MISSION_RUNNER").fprint
 
 @txros.util.cancellableInlineCallbacks
 def main():
diff --git a/command/sub8_missions/sub8/sub_singleton.py b/command/sub8_missions/sub8/sub_singleton.py
index 984540a4..5cbbfccc 100644
--- a/command/sub8_missions/sub8/sub_singleton.py
+++ b/command/sub8_missions/sub8/sub_singleton.py
@@ -8,7 +8,7 @@
 
 from mil_msgs.msg import MoveToAction, PoseTwistStamped, Float64Stamped
 from sub8 import pose_editor
-import sub8_tools
+import mil_ros_tools
 from sub8_msgs.srv import VisionRequest, VisionRequestRequest, VisionRequest2DRequest, VisionRequest2D
 from std_srvs.srv import SetBool, SetBoolRequest
 from nav_msgs.msg import Odometry
@@ -186,11 +186,11 @@ def tx_pose(self):
         '''Slighty safer to use.'''
         if self.test_mode:
             yield self.nh.sleep(.1)
-            blank = sub8_tools.pose_to_numpy(Odometry().pose.pose)
+            blank = mil_ros_tools.pose_to_numpy(Odometry().pose.pose)
             defer.returnValue(blank)
 
         next_odom_msg = yield self._odom_sub.get_next_message()
-        pose = sub8_tools.pose_to_numpy(next_odom_msg.pose.pose)
+        pose = mil_ros_tools.pose_to_numpy(next_odom_msg.pose.pose)
         defer.returnValue(pose)
 
     @property