Permalink
Browse files

Minor changes.

  • Loading branch information...
1 parent 984fb8d commit 7bf07e910e0adce81f0429ce8ea5cee4ebe785b4 @yoos committed Apr 24, 2012
Showing with 7 additions and 5 deletions.
  1. +1 −1 src/comm.py
  2. +6 −4 src/visualization.py
View
2 src/comm.py
@@ -227,7 +227,7 @@ def telemetry():
if __name__ == "__main__":
# Initialize ROS node.
rospy.init_node("tricopter_comm", anonymous=False)
- pub = rospy.Publisher("telemetry", Telemetry)
+ pub = rospy.Publisher("tricopter_telemetry", Telemetry)
sub = rospy.Subscriber("tricopter_inputs", Inputs, inputsCallback, queue_size=100)
# =========================================================================
View
10 src/visualization.py
@@ -15,9 +15,9 @@
from OpenGL.GL import *
from OpenGL.GLUT import*
from OpenGL.GLU import *
- rospy.loginfo("[VIS] OpenGL successfully imported!")
+ rospy.loginfo("[Vis] OpenGL successfully imported!")
except:
- rospy.logerr("[VIS] PyOpenGL not installed properly. Exiting...")
+ rospy.logerr("[Vis] PyOpenGL not installed properly. Exiting...")
exit(1)
@@ -26,7 +26,9 @@
# =============================================================================
# Initial DCM values.
-dcm = [[1.0, 0.0, 0.0], [0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]
+dcm = [[1.0, 0.0, 0.0],
+ [0.0, 1.0, 0.0],
+ [0.0, 0.0, 1.0]]
# Target rotation values
#targetRot = [0.0, 0.0, 0.0]
@@ -295,7 +297,7 @@ def __init__(self):
self.running = True
def run(self):
while self.running and not rospy.is_shutdown():
- rospy.Subscriber("telemetry", Telemetry, telCallback, queue_size=1)
+ rospy.Subscriber("tricopter_telemetry", Telemetry, telCallback, queue_size=1)
rospy.spin()
class Visualizer(threading.Thread):

0 comments on commit 7bf07e9

Please sign in to comment.