fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 18:13:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into indoor branch

Browse Source
This commit is contained in:
Lorenz Meier
2014-12-26 17:06:19 +01:00
parent f3a224e30d 5c51adf5f7
commit 407889ea2c
229 changed files with 27468 additions and 4247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/sf0x/sf0x.cpp
+3 -1
View File
@@ -547,7 +547,7 @@ SF0X::collect()
float si_units;
bool valid = false;
for (int i = 0; i < ret; i++) {
if (OK == sf0x_parser(readbuf[i], _linebuf, &_linebuf_index, &_parse_state, &si_units)) {
valid = true;
@@ -566,6 +566,8 @@ SF0X::collect()
report.timestamp = hrt_absolute_time();
report.error_count = perf_event_count(_comms_errors);
report.distance = si_units;
report.minimum_distance = get_minimum_distance();
report.maximum_distance = get_maximum_distance();
report.valid = valid && (si_units > get_minimum_distance() && si_units < get_maximum_distance() ? 1 : 0);
/* publish it */