lis3mdl i2c address is not board specific

cf54023c · Daniel Agar · Lorenz Meier · ad6df564 · cf54023c · cf54023c
Commit cf54023c authored 7 years ago by Daniel Agar Committed by Lorenz Meier 7 years ago
--- a/src/drivers/boards/auav-x21/board_config.h
+++ b/src/drivers/boards/auav-x21/board_config.h
@@ -121,7 +121,6 @@
 */
 #define PX4_I2C_OBDEV_LED	0x55
 #define PX4_I2C_OBDEV_HMC5883	0x1e
-#define PX4_I2C_OBDEV_LIS3MDL	0x1e

 /*
 * ADC channels

--- a/src/drivers/boards/nxphlite-v3/board_config.h
+++ b/src/drivers/boards/nxphlite-v3/board_config.h
@@ -267,7 +267,6 @@ __BEGIN_DECLS

 #define PX4_I2C_OBDEV_LED                   0x55
 #define PX4_I2C_OBDEV_HMC5883               0x1e
-#define PX4_I2C_OBDEV_LIS3MDL               0x1e

 /*
 * ADC channels

--- a/src/drivers/boards/px4-same70xplained-v1/board_config.h
+++ b/src/drivers/boards/px4-same70xplained-v1/board_config.h
@@ -219,7 +219,6 @@ __BEGIN_DECLS
 */
 #define PX4_I2C_OBDEV_LED	0x55
 #define PX4_I2C_OBDEV_HMC5883	0x1e
-#define PX4_I2C_OBDEV_LIS3MDL	0x1e

 /* Define the follwoing to output the clock on J500-1 */
 //#define GPIO_PCK1			(GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN17)

--- a/src/drivers/boards/px4fmu-v2/board_config.h
+++ b/src/drivers/boards/px4fmu-v2/board_config.h
@@ -228,7 +228,6 @@
 */
 #define PX4_I2C_OBDEV_LED	0x55
 #define PX4_I2C_OBDEV_HMC5883	0x1e
-#define PX4_I2C_OBDEV_LIS3MDL	0x1e

 /*----------------------------------------------------------*/
 /*           FMUv3 Cube SPI chip selects and DRDY           */

--- a/src/drivers/boards/px4fmu-v4/board_config.h
+++ b/src/drivers/boards/px4fmu-v4/board_config.h
@@ -164,7 +164,6 @@
 */
 #define PX4_I2C_OBDEV_LED            0x55
 #define PX4_I2C_OBDEV_HMC5883        0x1e
-#define PX4_I2C_OBDEV_LIS3MDL        0x1e
 #define PX4_I2C_OBDEV_BMP280         0x76

 /*

--- a/src/drivers/boards/px4fmu-v4pro/board_config.h
+++ b/src/drivers/boards/px4fmu-v4pro/board_config.h
@@ -182,7 +182,6 @@
 */
 #define PX4_I2C_OBDEV_LED       0x55
 #define PX4_I2C_OBDEV_HMC5883   0x1e
-#define PX4_I2C_OBDEV_LIS3MDL   0x1e

 /*
 * ADC channels

--- a/src/drivers/boards/px4fmu-v5/board_config.h
+++ b/src/drivers/boards/px4fmu-v5/board_config.h
@@ -243,7 +243,6 @@

 #define PX4_I2C_OBDEV_LED	    0x55
 #define PX4_I2C_OBDEV_HMC5883	0x1e
-#define PX4_I2C_OBDEV_LIS3MDL	0x1e

 /*
 * ADC channels

--- a/src/drivers/boards/px4nucleoF767ZI-v1/board_config.h
+++ b/src/drivers/boards/px4nucleoF767ZI-v1/board_config.h
@@ -167,7 +167,6 @@ __BEGIN_DECLS
 */
 #define PX4_I2C_OBDEV_LED	    0x55
 #define PX4_I2C_OBDEV_HMC5883	0x1e
-#define PX4_I2C_OBDEV_LIS3MDL	0x1e

 /*
 * ADC channels

--- a/src/drivers/magnetometer/lis3mdl/lis3mdl_i2c.cpp
+++ b/src/drivers/magnetometer/lis3mdl/lis3mdl_i2c.cpp
@@ -58,9 +58,9 @@
 #include "lis3mdl.h"
 #include "board_config.h"

-#ifdef PX4_I2C_OBDEV_LIS3MDL
+#if defined(PX4_I2C_BUS_ONBOARD) || defined(PX4_I2C_BUS_EXPANSION)

-#define LIS3MDLL_ADDRESS		PX4_I2C_OBDEV_LIS3MDL
+#define LIS3MDLL_ADDRESS		0x1e

 device::Device *LIS3MDL_I2C_interface(int bus);