mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-31 18:47:21 +08:00
lis3mdl i2c address is not board specific
This commit is contained in:
committed by
Lorenz Meier
parent
ad6df56438
commit
cf54023c96
@@ -121,7 +121,6 @@
|
|||||||
*/
|
*/
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC channels
|
* ADC channels
|
||||||
|
|||||||
@@ -267,7 +267,6 @@ __BEGIN_DECLS
|
|||||||
|
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC channels
|
* ADC channels
|
||||||
|
|||||||
@@ -219,7 +219,6 @@ __BEGIN_DECLS
|
|||||||
*/
|
*/
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/* Define the follwoing to output the clock on J500-1 */
|
/* Define the follwoing to output the clock on J500-1 */
|
||||||
//#define GPIO_PCK1 (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN17)
|
//#define GPIO_PCK1 (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN17)
|
||||||
|
|||||||
@@ -228,7 +228,6 @@
|
|||||||
*/
|
*/
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/*----------------------------------------------------------*/
|
/*----------------------------------------------------------*/
|
||||||
/* FMUv3 Cube SPI chip selects and DRDY */
|
/* FMUv3 Cube SPI chip selects and DRDY */
|
||||||
|
|||||||
@@ -164,7 +164,6 @@
|
|||||||
*/
|
*/
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
#define PX4_I2C_OBDEV_BMP280 0x76
|
#define PX4_I2C_OBDEV_BMP280 0x76
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -182,7 +182,6 @@
|
|||||||
*/
|
*/
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC channels
|
* ADC channels
|
||||||
|
|||||||
@@ -243,7 +243,6 @@
|
|||||||
|
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC channels
|
* ADC channels
|
||||||
|
|||||||
@@ -167,7 +167,6 @@ __BEGIN_DECLS
|
|||||||
*/
|
*/
|
||||||
#define PX4_I2C_OBDEV_LED 0x55
|
#define PX4_I2C_OBDEV_LED 0x55
|
||||||
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
#define PX4_I2C_OBDEV_HMC5883 0x1e
|
||||||
#define PX4_I2C_OBDEV_LIS3MDL 0x1e
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC channels
|
* ADC channels
|
||||||
|
|||||||
@@ -58,9 +58,9 @@
|
|||||||
#include "lis3mdl.h"
|
#include "lis3mdl.h"
|
||||||
#include "board_config.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);
|
device::Device *LIS3MDL_I2C_interface(int bus);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user