Merge branch 'john'

strawlab · Jan 15, 2016 · 287d18f · 287d18f
2 parents efbbbdc + 7e7d201
commit 287d18f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/nodes/camnode b/nodes/camnode
@@ -17,6 +17,7 @@ def main():
     rospy.init_node('flydra_camnode')
 
     spinthread = threading.Thread(target=rospy.spin)
+    spinthread.setDaemon(True)
     spinthread.start()
 
     flydra.camnode.main(

diff --git a/srv/MainBrainLogMessage.srv b/srv/MainBrainLogMessage.srv
@@ -0,0 +1,4 @@
+std_msgs/String cam_id
+std_msgs/Float32 timestamp
+std_msgs/String message
+---