Merge remote-tracking branch 'px4/pr/2200' into lidarlite_merge

This commit is contained in:
Ban Siesta
2015-05-24 16:30:02 +01:00
5 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -420,7 +420,7 @@ MavlinkReceiver::handle_message_optical_flow_rad(mavlink_message_t *msg)
struct distance_sensor_s d;
memset(&d, 0, sizeof(d));
d.timestamp = hrt_absolute_time();
d.timestamp = flow.integration_time_us * 1000; /* ms to us */
d.min_distance = 0.3f;
d.max_distance = 5.0f;
d.current_distance = flow.distance; /* both are in m */