Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/cuckoo #59

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion launch/asl_vicon.launch
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<launch>
<arg name="object_name" default="bluebird" />
<arg name="timestamping_system" default="ros" />

<node ns="$(arg object_name)" name="vrpn_client" type="ros_vrpn_client" pkg="ros_vrpn_client" output="screen">
<param name="vrpn_server_ip" value="vicon" />
<param name="vrpn_coordinate_system" value="vicon" />
<param name="timestamping_system" value="ros" />
<param name="timestamping_system" value="$(arg timestamping_system)" />
<param name="object_name" value="$(arg object_name)" />
<param name="verbose" value="true" />
<param name="translational_estimator/kp" value="0.5" />
Expand Down
2 changes: 2 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@
<depend>eigen_conversions</depend>
<depend>glog_catkin</depend>

<depend>cuckoo_time_translator</depend>

</package>
38 changes: 35 additions & 3 deletions src/ros_vrpn_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
#include <tf/transform_broadcaster.h>
#include <glog/logging.h>

#include <memory>
#include <cuckoo_time_translator/ClockParameters.h>
#include <cuckoo_time_translator/DeviceTimeTranslator.h>

#include "vicon_odometry_estimator.h"

void VRPN_CALLBACK track_target(void*, const vrpn_TRACKERCB tracker);
Expand All @@ -80,7 +84,12 @@ struct TargetState {
enum CoordinateSystem { kVicon, kOptitrack } coordinate_system;

// Available timestamping options.
enum TimestampingSystem { kTrackerStamp, kRosStamp } timestamping_system;
enum TimestampingSystem { kTrackerStamp,
kRosStamp,
kTranslation
} timestamping_system;

std::shared_ptr<cuckoo_time_translator::DefaultDeviceTimeUnwrapperAndTranslator> device_time_translator;

// Global target descriptions.
TargetState* target_state;
Expand Down Expand Up @@ -252,6 +261,11 @@ void inline getTimeStamp(const ros::Time& vicon_stamp, ros::Time* timestamp) {
*timestamp = ros::Time::now();
break;
}
case kTranslation: {
if(device_time_translator) {
*timestamp = device_time_translator->update(vicon_stamp.toNSec(), ros::Time::now());
}
}
}
}

Expand Down Expand Up @@ -296,7 +310,7 @@ void VRPN_CALLBACK track_target(void*, const vrpn_TRACKERCB tracker) {
vicon_odometry_estimator->updateEstimate(position_measured_W,
orientation_measured_B_W,
timestamp);
Eigen::Vector3d position_estimate_W =
Eigen::Vector3d position_estimate_W =
vicon_odometry_estimator->getEstimatedPosition();
Eigen::Vector3d velocity_estimate_W =
vicon_odometry_estimator->getEstimatedVelocity();
Expand Down Expand Up @@ -400,9 +414,27 @@ int main(int argc, char* argv[]) {
timestamping_system = TimestampingSystem::kTrackerStamp;
} else if (timestamping_system_string == "ros") {
timestamping_system = TimestampingSystem::kRosStamp;
} else if (timestamping_system_string == "translation") {
timestamping_system = TimestampingSystem::kTranslation;

const bool kAppendDeviceTimeSubnamespace = true;
const double kSwitchingTime = 100.0; // s
const uint64_t kOverflow = 0xFFFFFFFFFFFFFFFF; // 64 bit
const double kClockFrequency = 1e9; // nanoseconds

cuckoo_time_translator::Defaults defaults;
defaults.setFilterAlgorithm(
cuckoo_time_translator::FilterAlgorithm(
cuckoo_time_translator::FilterAlgorithm::Type::ConvexHull));
defaults.setSwitchTimeSecs(kSwitchingTime);
device_time_translator.reset(
new cuckoo_time_translator::DefaultDeviceTimeUnwrapperAndTranslator(
{kOverflow, kClockFrequency},
{nh.getNamespace(), kAppendDeviceTimeSubnamespace},
defaults));
} else {
ROS_FATAL(
"ROS param timestamping_system should be either 'tracker' or 'ros'!");
"ROS param timestamping_system should be either 'tracker' or 'ros' or 'translation'!");
return EXIT_FAILURE;
}

Expand Down