dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

sensors: do not exit task on error

This commit is contained in:
Thomas Gubler 2014-08-17 15:21:27 +02:00
parent 91d8cb2edc
commit 86ae2e489f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/sensors/sensors.cpp
View File

@ -143,6 +143,12 @@
#define STICK_ON_OFF_LIMIT 0.75f #define STICK_ON_OFF_LIMIT 0.75f
/* oddly, ERROR is not defined for c++ */
#ifdef ERROR
# undef ERROR
#endif
static const int ERROR = -1;
/** /**
* Sensor app start / stop handling function * Sensor app start / stop handling function
* *
@ -466,12 +472,6 @@ private:
namespace sensors namespace sensors
{ {
/* oddly, ERROR is not defined for c++ */
#ifdef ERROR
# undef ERROR
#endif
static const int ERROR = -1;
Sensors *g_sensors = nullptr; Sensors *g_sensors = nullptr;
} }
@ -860,7 +860,9 @@ Sensors::parameters_update()
warnx("qnh ioctl, %lu", (unsigned long)(_parameters.baro_qnh * 100)); warnx("qnh ioctl, %lu", (unsigned long)(_parameters.baro_qnh * 100));
int ret = ioctl(fd, BAROIOCSMSLPRESSURE, (unsigned long)(_parameters.baro_qnh * 100)); int ret = ioctl(fd, BAROIOCSMSLPRESSURE, (unsigned long)(_parameters.baro_qnh * 100));
if (ret) { if (ret) {
errx(ret, "qnh could not be set"); warnx("qnh could not be set");
close(fd);
return ERROR;
} }
close(fd); close(fd);
} }