diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-17 15:25:54 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-08-17 15:25:54 +0200 |
| commit | 66709ec2959a1011767bba2715752d9d667440e2 (patch) | |
| tree | 6a7b368cf1fb0a2cd66831d371a6e92146054b71 | |
| parent | db422a3f907ee5939b99f4d7530e58a06162e06f (diff) | |
| parent | 86ae2e489fdd3656faa38202f44e4b53342e450b (diff) | |
| download | px4-firmware-66709ec2959a1011767bba2715752d9d667440e2.tar.gz px4-firmware-66709ec2959a1011767bba2715752d9d667440e2.tar.bz2 px4-firmware-66709ec2959a1011767bba2715752d9d667440e2.zip | |
Merge remote-tracking branch 'upstream/qnh' into obcfailsafe
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 0d51667d0..aac297ef8 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -143,6 +143,12 @@ #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 * @@ -466,12 +472,6 @@ private: namespace sensors { -/* oddly, ERROR is not defined for c++ */ -#ifdef ERROR -# undef ERROR -#endif -static const int ERROR = -1; - Sensors *g_sensors = nullptr; } @@ -860,7 +860,9 @@ Sensors::parameters_update() warnx("qnh ioctl, %lu", (unsigned long)(_parameters.baro_qnh * 100)); int ret = ioctl(fd, BAROIOCSMSLPRESSURE, (unsigned long)(_parameters.baro_qnh * 100)); if (ret) { - errx(ret, "qnh could not be set"); + warnx("qnh could not be set"); + close(fd); + return ERROR; } close(fd); } |