diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-04-26 22:01:18 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-04-26 22:01:18 +0200 |
| commit | 811dd12ac56396d752def4070288fc74a7dd1abb (patch) | |
| tree | bcf22c437a0592a52c2ce1cdd6117c70385f0ce4 /src/drivers/ets_airspeed/ets_airspeed.cpp | |
| parent | cfe346ddfafbc1d2e04f510fbee8b6fc3b1aedb3 (diff) | |
| parent | 4a949a9565b08bac24130b36bd677d9d08b7cdc8 (diff) | |
| download | px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.tar.gz px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.tar.bz2 px4-firmware-811dd12ac56396d752def4070288fc74a7dd1abb.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'src/drivers/ets_airspeed/ets_airspeed.cpp')
| -rw-r--r-- | src/drivers/ets_airspeed/ets_airspeed.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/drivers/ets_airspeed/ets_airspeed.cpp b/src/drivers/ets_airspeed/ets_airspeed.cpp index d873a1132..146a06e7c 100644 --- a/src/drivers/ets_airspeed/ets_airspeed.cpp +++ b/src/drivers/ets_airspeed/ets_airspeed.cpp @@ -207,14 +207,18 @@ ETSAirspeed::collect() void ETSAirspeed::cycle() { + int ret; + /* collection phase? */ if (_collect_phase) { /* perform collection */ - if (OK != collect()) { + ret = collect(); + if (OK != ret) { perf_count(_comms_errors); /* restart the measurement state machine */ start(); + _sensor_ok = false; return; } @@ -238,8 +242,12 @@ ETSAirspeed::cycle() } /* measurement phase */ - if (OK != measure()) - log("measure error"); + ret = measure(); + if (OK != ret) { + debug("measure error"); + } + + _sensor_ok = (ret == OK); /* next phase is collection */ _collect_phase = true; |