Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[14924] pkg/trunk
|
From: <ge...@us...> - 2009-05-06 03:11:44
|
Revision: 14924
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=14924&view=rev
Author: gerkey
Date: 2009-05-06 03:11:41 +0000 (Wed, 06 May 2009)
Log Message:
-----------
Fixed build for moved mocap messages
Modified Paths:
--------------
pkg/trunk/calibration/kinematic_calibration/manifest.xml
pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData.msg
pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData2.msg
pkg/trunk/calibration/kinematic_calibration/msg/SensorKinematics.msg
pkg/trunk/calibration/kinematic_calibration/src/arm_phasespace_grabber.cpp
pkg/trunk/drivers/phase_space/manifest.xml
pkg/trunk/drivers/phase_space/phase_space_node.cpp
pkg/trunk/drivers/phase_space/phase_space_node.h
Modified: pkg/trunk/calibration/kinematic_calibration/manifest.xml
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/manifest.xml 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/calibration/kinematic_calibration/manifest.xml 2009-05-06 03:11:41 UTC (rev 14924)
@@ -6,6 +6,7 @@
<depend package="kdl" />
<depend package="phase_space" />
<depend package="robot_msgs" />
+ <depend package="mocap_msgs" />
<depend package="std_msgs" />
<depend package="robot_kinematics" />
<depend package="topic_synchronizer" />
Modified: pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData.msg
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData.msg 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData.msg 2009-05-06 03:11:41 UTC (rev 14924)
@@ -14,4 +14,4 @@
robot_msgs/PointCloud laser_cloud
# Data that we captured from phasespace
-robot_msgs/MocapSnapshot mocap_snapshot
+mocap_msgs/MocapSnapshot mocap_snapshot
Modified: pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData2.msg
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData2.msg 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/calibration/kinematic_calibration/msg/CalibrationData2.msg 2009-05-06 03:11:41 UTC (rev 14924)
@@ -14,8 +14,8 @@
robot_msgs/PointCloud laser_cloud
# Data that we captured from phasespace
-robot_msgs/MocapSnapshot mocap_snapshot
+mocap_msgs/MocapSnapshot mocap_snapshot
# Data from multiple monocular cameras
image_msgs/Image[] image
-image_msgs/CamInfo[] cam_info
\ No newline at end of file
+image_msgs/CamInfo[] cam_info
Modified: pkg/trunk/calibration/kinematic_calibration/msg/SensorKinematics.msg
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/msg/SensorKinematics.msg 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/calibration/kinematic_calibration/msg/SensorKinematics.msg 2009-05-06 03:11:41 UTC (rev 14924)
@@ -19,4 +19,4 @@
robot_msgs/PointCloud laser_cloud
# Data that we captured from phasespace
-robot_msgs/MocapSnapshot phase_space_snapshot
+mocap_msgs/MocapSnapshot phase_space_snapshot
Modified: pkg/trunk/calibration/kinematic_calibration/src/arm_phasespace_grabber.cpp
===================================================================
--- pkg/trunk/calibration/kinematic_calibration/src/arm_phasespace_grabber.cpp 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/calibration/kinematic_calibration/src/arm_phasespace_grabber.cpp 2009-05-06 03:11:41 UTC (rev 14924)
@@ -37,7 +37,7 @@
#include "ros/node.h"
#include "boost/thread/mutex.hpp"
#include "robot_msgs/MechanismState.h"
-#include "robot_msgs/MocapSnapshot.h"
+#include "mocap_msgs/MocapSnapshot.h"
#include "robot_kinematics/robot_kinematics.h"
#include "kdl/chain.hpp"
@@ -111,7 +111,7 @@
case ' ':
{
printf("Capturing...\n") ;
- robot_msgs::MocapMarker cur_marker ;
+ mocap_msgs::MocapMarker cur_marker ;
//GetMarker(cur_marker, marker_id_) ;
@@ -238,7 +238,7 @@
return true ;
}
- void GetMarker(robot_msgs::MocapMarker& marker, int id)
+ void GetMarker(mocap_msgs::MocapMarker& marker, int id)
{
bool marker_found = false ;
@@ -304,10 +304,10 @@
}
private:
- robot_msgs::MocapSnapshot snapshot_ ;
+ mocap_msgs::MocapSnapshot snapshot_ ;
robot_msgs::MechanismState mech_state_ ;
- robot_msgs::MocapSnapshot safe_snapshot_ ;
+ mocap_msgs::MocapSnapshot safe_snapshot_ ;
int marker_id_ ;
robot_msgs::MechanismState safe_mech_state_ ;
Modified: pkg/trunk/drivers/phase_space/manifest.xml
===================================================================
--- pkg/trunk/drivers/phase_space/manifest.xml 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/drivers/phase_space/manifest.xml 2009-05-06 03:11:41 UTC (rev 14924)
@@ -5,7 +5,7 @@
<review status="unreviewed" notes=""/>
<depend package="roscpp" />
<depend package="std_msgs" />
- <depend package="robot_msgs" />
+ <depend package="mocap_msgs" />
<depend package="rospy" />
<sysdepend os="ubuntu" version="8.04-hardy" package="libstdc++5"/>
Modified: pkg/trunk/drivers/phase_space/phase_space_node.cpp
===================================================================
--- pkg/trunk/drivers/phase_space/phase_space_node.cpp 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/drivers/phase_space/phase_space_node.cpp 2009-05-06 03:11:41 UTC (rev 14924)
@@ -57,7 +57,7 @@
PhaseSpaceNode::PhaseSpaceNode() : ros::Node("phase_space")
{
- advertise<robot_msgs::MocapSnapshot>("phase_space_snapshot", 1) ;
+ advertise<mocap_msgs::MocapSnapshot>("phase_space_snapshot", 1) ;
}
PhaseSpaceNode::~PhaseSpaceNode()
@@ -88,7 +88,7 @@
while (ok()) // While the node has not been shutdown
{
usleep(1) ;
- robot_msgs::MocapSnapshot snapshot ;
+ mocap_msgs::MocapSnapshot snapshot ;
snapshot.header.frame_id = "phase_space" ;
@@ -112,7 +112,7 @@
return true ;
}
-int PhaseSpaceNode::grabMarkers(robot_msgs::MocapSnapshot& snapshot)
+int PhaseSpaceNode::grabMarkers(mocap_msgs::MocapSnapshot& snapshot)
{
OWLMarker markers[MAX_NUM_MARKERS] ;
@@ -147,7 +147,7 @@
return n ;
}
-int PhaseSpaceNode::grabBodies(robot_msgs::MocapSnapshot& snapshot)
+int PhaseSpaceNode::grabBodies(mocap_msgs::MocapSnapshot& snapshot)
{
OWLRigid bodies[MAX_NUM_BODIES] ;
int n = owlGetRigids(bodies, MAX_NUM_BODIES) ;
@@ -173,7 +173,7 @@
return n ;
}
-void PhaseSpaceNode::grabTime(robot_msgs::MocapSnapshot& snapshot)
+void PhaseSpaceNode::grabTime(mocap_msgs::MocapSnapshot& snapshot)
{
int timeVal[3] ;
timeVal[0] = 0 ;
@@ -193,7 +193,7 @@
owlDone() ; // OWL API-call to perform system cleanup before client termination
}
-void PhaseSpaceNode::copyMarkerToMessage(const OWLMarker& owl_marker, robot_msgs::MocapMarker& msg_marker)
+void PhaseSpaceNode::copyMarkerToMessage(const OWLMarker& owl_marker, mocap_msgs::MocapMarker& msg_marker)
{
msg_marker.id = owl_marker.id ;
@@ -204,7 +204,7 @@
msg_marker.condition = owl_marker.cond ;
}
-void PhaseSpaceNode::copyBodyToMessage(const OWLRigid& owl_body, robot_msgs::MocapBody& msg_body)
+void PhaseSpaceNode::copyBodyToMessage(const OWLRigid& owl_body, mocap_msgs::MocapBody& msg_body)
{
msg_body.id = owl_body.id ;
@@ -236,7 +236,7 @@
printf("%s: 0x%x\n", s, n);
}
-void PhaseSpaceNode::dispSnapshot(const robot_msgs::MocapSnapshot& s)
+void PhaseSpaceNode::dispSnapshot(const mocap_msgs::MocapSnapshot& s)
{
printf("rosTF_frame: %s Frame #%u\n", s.header.frame_id.c_str(), s.frameNum) ;
printf(" Time: %lf\n", s.header.stamp.toSec()) ;
Modified: pkg/trunk/drivers/phase_space/phase_space_node.h
===================================================================
--- pkg/trunk/drivers/phase_space/phase_space_node.h 2009-05-06 02:53:38 UTC (rev 14923)
+++ pkg/trunk/drivers/phase_space/phase_space_node.h 2009-05-06 03:11:41 UTC (rev 14924)
@@ -48,9 +48,9 @@
#include "owl.h"
// Messages
-#include "robot_msgs/MocapSnapshot.h"
-#include "robot_msgs/MocapMarker.h"
-#include "robot_msgs/MocapBody.h"
+#include "mocap_msgs/MocapSnapshot.h"
+#include "mocap_msgs/MocapMarker.h"
+#include "mocap_msgs/MocapBody.h"
namespace phase_space
{
@@ -68,13 +68,13 @@
bool spin() ;
private :
- int grabMarkers(robot_msgs::MocapSnapshot& snapshot) ;
- int grabBodies (robot_msgs::MocapSnapshot& snapshot) ;
- void grabTime (robot_msgs::MocapSnapshot& snapshot) ;
- void copyMarkerToMessage(const OWLMarker& owl_marker, robot_msgs::MocapMarker& msg_marker) ;
- void copyBodyToMessage(const OWLRigid& owl_body, robot_msgs::MocapBody& msg_body) ;
+ int grabMarkers(mocap_msgs::MocapSnapshot& snapshot) ;
+ int grabBodies (mocap_msgs::MocapSnapshot& snapshot) ;
+ void grabTime (mocap_msgs::MocapSnapshot& snapshot) ;
+ void copyMarkerToMessage(const OWLMarker& owl_marker, mocap_msgs::MocapMarker& msg_marker) ;
+ void copyBodyToMessage(const OWLRigid& owl_body, mocap_msgs::MocapBody& msg_body) ;
void owlPrintError(const char *s, int n) ;
- void dispSnapshot(const robot_msgs::MocapSnapshot& snapshot) ;
+ void dispSnapshot(const mocap_msgs::MocapSnapshot& snapshot) ;
} ;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
