From 1e6bec6c77052f1eae7696c709dbc2edb503aa2b Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Sun, 15 Feb 2015 16:17:46 +0100 Subject: [PATCH] HMC5883: Always report as internal sensor in SPI mode, since the sensor is fixed to the autopilot assembly. --- src/drivers/hmc5883/hmc5883_spi.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/drivers/hmc5883/hmc5883_spi.cpp b/src/drivers/hmc5883/hmc5883_spi.cpp index aec990ca88..b88310539a 100644 --- a/src/drivers/hmc5883/hmc5883_spi.cpp +++ b/src/drivers/hmc5883/hmc5883_spi.cpp @@ -138,15 +138,12 @@ HMC5883_SPI::ioctl(unsigned operation, unsigned &arg) switch (operation) { case MAGIOCGEXTERNAL: - -#ifdef PX4_SPI_BUS_EXT - if (_bus == PX4_SPI_BUS_EXT) { - return 1; - } else -#endif - { - return 0; - } + /* + * Even if this sensor is on the external SPI + * bus it is still internal to the autopilot + * assembly, so always return 0 for internal. + */ + return 0; case DEVIOCGDEVICEID: return CDev::ioctl(nullptr, operation, arg);