From cf54023c9613a4f5b783ccd2d2f7c7e0adde968f Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 8 Feb 2018 10:34:32 -0500
Subject: [PATCH] lis3mdl i2c address is not board specific

---
 src/drivers/boards/auav-x21/board_config.h              | 1 -
 src/drivers/boards/nxphlite-v3/board_config.h           | 1 -
 src/drivers/boards/px4-same70xplained-v1/board_config.h | 1 -
 src/drivers/boards/px4fmu-v2/board_config.h             | 1 -
 src/drivers/boards/px4fmu-v4/board_config.h             | 1 -
 src/drivers/boards/px4fmu-v4pro/board_config.h          | 1 -
 src/drivers/boards/px4fmu-v5/board_config.h             | 1 -
 src/drivers/boards/px4nucleoF767ZI-v1/board_config.h    | 1 -
 src/drivers/magnetometer/lis3mdl/lis3mdl_i2c.cpp        | 4 ++--
 9 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/drivers/boards/auav-x21/board_config.h b/src/drivers/boards/auav-x21/board_config.h
index a84b2b74e6..168525b9c4 100644
--- 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
diff --git a/src/drivers/boards/nxphlite-v3/board_config.h b/src/drivers/boards/nxphlite-v3/board_config.h
index 92347af596..8c0da20b5b 100644
--- 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
diff --git a/src/drivers/boards/px4-same70xplained-v1/board_config.h b/src/drivers/boards/px4-same70xplained-v1/board_config.h
index 52ee0cf656..811b1ee386 100644
--- 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)
diff --git a/src/drivers/boards/px4fmu-v2/board_config.h b/src/drivers/boards/px4fmu-v2/board_config.h
index dc6d244cb8..e6fadb9b93 100644
--- 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           */
diff --git a/src/drivers/boards/px4fmu-v4/board_config.h b/src/drivers/boards/px4fmu-v4/board_config.h
index d524375896..63fc6a39e5 100644
--- 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
 
 /*
diff --git a/src/drivers/boards/px4fmu-v4pro/board_config.h b/src/drivers/boards/px4fmu-v4pro/board_config.h
index 1048feb9a1..cb8e48da27 100644
--- 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
diff --git a/src/drivers/boards/px4fmu-v5/board_config.h b/src/drivers/boards/px4fmu-v5/board_config.h
index c9b1e04144..78fd588ce9 100644
--- 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
diff --git a/src/drivers/boards/px4nucleoF767ZI-v1/board_config.h b/src/drivers/boards/px4nucleoF767ZI-v1/board_config.h
index a4a2dbf9a0..c40859bca2 100644
--- 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
diff --git a/src/drivers/magnetometer/lis3mdl/lis3mdl_i2c.cpp b/src/drivers/magnetometer/lis3mdl/lis3mdl_i2c.cpp
index 5215d52960..939eb2e3c8 100644
--- 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);