Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

added ptp sync #1

Merged
merged 1 commit into from
Sep 12, 2018
Merged
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
2 changes: 2 additions & 0 deletions ouster_client/src/os1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ std::shared_ptr<client> init_client(const std::string& hostname,
success &= do_cmd("set_udp_port_lidar", std::to_string(lidar_port));
success &= do_cmd("set_udp_port_imu", std::to_string(imu_port));
success &= do_cmd("set_udp_ip", udp_dest_host);
success &= do_cmd("set_timestamp_mode", "TIME_FROM_PTP_1588");
success &= do_cmd("reinitialize", "");

if (!success) return std::shared_ptr<client>();

Expand Down
26 changes: 23 additions & 3 deletions ouster_ros/src/os1_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@
using ns = std::chrono::nanoseconds;
using PacketMsg = ouster_ros::PacketMsg;

bool validTimestamp(const ros::Time& msg_time) {
const ros::Duration kMaxTimeOffset(1.0);

const ros::Time now = ros::Time::now();
if (msg_time < (now - kMaxTimeOffset)) {
ROS_WARN_STREAM_THROTTLE(
1, "OS1 clock is currently not in sync with host. Current host time: "
<< now << " OS1 message time: " << msg_time
<< ". Rejecting measurement.");
return false;
}
return true;
}

int main(int argc, char** argv) {
ros::init(argc, argv, "ouster_driver");
ros::NodeHandle nh("~");
Expand All @@ -49,12 +63,18 @@ int main(int argc, char** argv) {

auto lidar_handler = ouster_ros::OS1::batch_packets(
scan_dur, [&](ns scan_ts, const ouster_ros::OS1::CloudOS1& cloud) {
lidar_pub.publish(
ouster_ros::OS1::cloud_to_cloud_msg(cloud, scan_ts));
sensor_msgs::PointCloud2 msg =
ouster_ros::OS1::cloud_to_cloud_msg(cloud, scan_ts);
if (validTimestamp(msg.header.stamp)) {
lidar_pub.publish(msg);
}
});

auto imu_handler = [&](const PacketMsg& p) {
imu_pub.publish(ouster_ros::OS1::packet_to_imu_msg(p));
sensor_msgs::Imu msg = ouster_ros::OS1::packet_to_imu_msg(p);
if(validTimestamp(msg.header.stamp)){
imu_pub.publish(msg);
}
};

if (replay_mode) {
Expand Down