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

sensors: the ifdef logic was inverted (#4401)

This commit is contained in:
Julian Oes 2016-04-29 16:21:52 +02:00 committed by Lorenz Meier
parent 49ae3e17d5
commit eb1ab4011a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -952,7 +952,7 @@ Sensors::parameters_update()
DevHandle h_baro;
DevMgr::getHandle(BARO0_DEVICE_PATH, h_baro);
#if defined(__PX4_QURT) || defined(__RPI2)
#if !defined(__PX4_QURT) && !defined(__RPI2)
// TODO: this needs fixing for QURT and Raspberry Pi
if (!h_baro.isValid()) {
@ -1520,7 +1520,7 @@ Sensors::parameter_update_poll(bool forced)
bool
Sensors::apply_gyro_calibration(DevHandle &h, const struct gyro_calibration_s *gcal, const int device_id)
{
#if defined(__PX4_QURT) || defined(__RPI2)
#if !defined(__PX4_QURT) && !defined(__RPI2)
/* On most systems, we can just use the IOCTL call to set the calibration params. */
const int res = h.ioctl(GYROIOCSSCALE, (long unsigned int)gcal);
@ -1541,7 +1541,7 @@ Sensors::apply_gyro_calibration(DevHandle &h, const struct gyro_calibration_s *g
bool
Sensors::apply_accel_calibration(DevHandle &h, const struct accel_calibration_s *acal, const int device_id)
{
#if defined(__PX4_QURT) || defined(__RPI2)
#if !defined(__PX4_QURT) && !defined(__RPI2)
/* On most systems, we can just use the IOCTL call to set the calibration params. */
const int res = h.ioctl(ACCELIOCSSCALE, (long unsigned int)acal);
@ -1562,7 +1562,7 @@ Sensors::apply_accel_calibration(DevHandle &h, const struct accel_calibration_s
bool
Sensors::apply_mag_calibration(DevHandle &h, const struct mag_calibration_s *mcal, const int device_id)
{
#if defined(__PX4_QURT) || defined(__RPI2)
#if !defined(__PX4_QURT) && !defined(__RPI2)
/* On most systems, we can just use the IOCTL call to set the calibration params. */
const int res = h.ioctl(MAGIOCSSCALE, (long unsigned int)mcal);
@ -2065,7 +2065,7 @@ Sensors::task_main()
/* This calls a sensors_init which can have different implementations on NuttX, POSIX, QURT. */
ret = sensors_init();
#if defined(__PX4_QURT) || defined(__RPI2)
#if !defined(__PX4_QURT) && !defined(__RPI2)
// TODO: move adc_init into the sensors_init call.
ret = ret || adc_init();
#endif