Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MIL COMMON: move remaining sub8_tool includes to mil_common
Browse files Browse the repository at this point in the history
kev-the-dev committed Apr 11, 2017
1 parent dd34041 commit 4cca380
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion command/sub8_launch/nodes/self_check.py
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion command/sub8_missions/missions/autonomous.py
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions command/sub8_missions/nodes/move_command
Original file line number Diff line number Diff line change
@@ -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):
4 changes: 2 additions & 2 deletions command/sub8_missions/nodes/run_mission
Original file line number Diff line number Diff line change
@@ -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():
6 changes: 3 additions & 3 deletions command/sub8_missions/sub8/sub_singleton.py
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4cca380

Please sign in to comment.