diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-04-25 21:39:59 +0200 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-04-25 21:39:59 +0200 |
commit | 0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4 (patch) | |
tree | 83633532329f235c689e4121b75c2b7e1e240e3e /src/modules/sensors | |
parent | 22aaae197b443cc7248588ebdf6aeffe078e0a43 (diff) | |
parent | f0298e005a7d8f7bb0b9df98e64a2c59ff04d2b0 (diff) | |
download | px4-firmware-0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4.tar.gz px4-firmware-0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4.tar.bz2 px4-firmware-0c1de817852dfcbb00b19bd52a16ce80e3c2bbb4.zip |
Merge branch 'master' into mpc_rc
Diffstat (limited to 'src/modules/sensors')
-rw-r--r-- | src/modules/sensors/sensors.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 41e2148ac..a73599526 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1242,7 +1242,7 @@ Sensors::adc_poll(struct sensor_combined_s &raw) } } _last_adc = t; - if (_battery_status.voltage_v > 0.0f) { + if (_battery_status.voltage_filtered_v > BATT_V_IGNORE_THRESHOLD) { /* announce the battery status if needed, just publish else */ if (_battery_pub > 0) { orb_publish(ORB_ID(battery_status), _battery_pub, &_battery_status); @@ -1527,12 +1527,10 @@ Sensors::task_main() while (!_task_should_exit) { - /* wait for up to 100ms for data */ - int pret = poll(&fds[0], (sizeof(fds) / sizeof(fds[0])), 100); + /* wait for up to 50ms for data */ + int pret = poll(&fds[0], (sizeof(fds) / sizeof(fds[0])), 50); - /* timed out - periodic check for _task_should_exit, etc. */ - if (pret == 0) - continue; + /* if pret == 0 it timed out - periodic check for _task_should_exit, etc. */ /* this is undesirable but not much we can do - might want to flag unhappy status */ if (pret < 0) { @@ -1571,7 +1569,7 @@ Sensors::task_main() perf_end(_loop_perf); } - printf("[sensors] exiting.\n"); + warnx("[sensors] exiting."); _sensors_task = -1; _exit(0); |