Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-23 16:23:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_RangeFinder: update for upstream merge

Browse Source
This commit is contained in:
Andrew Tridgell 2015-05-31 14:49:55 +10:00
parent 23d291f144
commit 2167675b3d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/AP_RangeFinder/AP_RangeFinder_PX4.cpp
View File

@ -26,6 +26,7 @@
#include <drivers/drv_range_finder.h> #include <drivers/drv_range_finder.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <uORB/topics/distance_sensor.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
@ -106,7 +107,7 @@ void AP_RangeFinder_PX4::update(void)
return; return;
} }
struct range_finder_report range_report; struct distance_sensor_s range_report;
float sum = 0; float sum = 0;
uint16_t count = 0; uint16_t count = 0;
@ -125,7 +126,7 @@ void AP_RangeFinder_PX4::update(void)
while (::read(_fd, &range_report, sizeof(range_report)) == sizeof(range_report) && while (::read(_fd, &range_report, sizeof(range_report)) == sizeof(range_report) &&
range_report.timestamp != _last_timestamp) { range_report.timestamp != _last_timestamp) {
// take reading // take reading
sum += range_report.distance; sum += range_report.current_distance;
count++; count++;
_last_timestamp = range_report.timestamp; _last_timestamp = range_report.timestamp;
} }