aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/sf0x
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-12-26 17:06:19 +0100
committerLorenz Meier <lm@inf.ethz.ch>2014-12-26 17:06:19 +0100
commit407889ea2c472ed5be950307bb5dc27f07f88006 (patch)
tree0dacd8384fd8a136c27163da1e22a086a0b9d3d5 /src/drivers/sf0x
parentf3a224e30d8a70418541a6185ce5765b37745a7a (diff)
parent5c51adf5f79266de2b483c2461babd4d673cfffb (diff)
downloadpx4-firmware-407889ea2c472ed5be950307bb5dc27f07f88006.tar.gz
px4-firmware-407889ea2c472ed5be950307bb5dc27f07f88006.tar.bz2
px4-firmware-407889ea2c472ed5be950307bb5dc27f07f88006.zip
Merged master into indoor branch
Diffstat (limited to 'src/drivers/sf0x')
-rw-r--r--src/drivers/sf0x/sf0x.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/drivers/sf0x/sf0x.cpp b/src/drivers/sf0x/sf0x.cpp
index 795d61704..8e62e0d4b 100644
--- a/src/drivers/sf0x/sf0x.cpp
+++ b/src/drivers/sf0x/sf0x.cpp
@@ -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 */