fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 03:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

move hmc5883 i2c address into driver

Browse Source
This commit is contained in:
Daniel Agar
2018-03-14 14:38:40 -04:00
parent bb7466c596
commit f194c5424c
13 changed files with 2 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/boards/aerofc-v1/board_config.h
-2
View File
@@ -84,8 +84,6 @@
#define PX4_I2C_BUS_EXPANSION1 2
#define PX4_I2C_BUS_ONBOARD 3
#define PX4_I2C_OBDEV_HMC5883 0x1e
#define GPIO_SPI_CS_MPU6500 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTA|GPIO_PIN4)
#define PX4_SPI_BUS_SENSORS 1
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1)
src/drivers/boards/auav-x21/board_config.h
-6
View File
@@ -115,12 +115,6 @@
#define PX4_I2C_BUS_EXPANSION 1
#define PX4_I2C_BUS_LED PX4_I2C_BUS_EXPANSION
/* Devices not on the onboard bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
/*
* ADC channels
*
src/drivers/boards/mindpx-v2/board_config.h
-7
View File
@@ -131,13 +131,6 @@
#define PX4_I2C_BUS_EXPANSION 2
#define PX4_I2C_BUS_LED PX4_I2C_BUS_EXPANSION
/* Devices on the onboard bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
// #define PX4_I2C_OBDEV_MPU6050 0x68
/*
* ADC channels
*
src/drivers/boards/nxphlite-v3/board_config.h
-2
View File
@@ -265,8 +265,6 @@ __BEGIN_DECLS
#define PX4_I2C_BUS_LED PX4_I2C_BUS_EXPANSION
#define PX4_I2C_OBDEV_HMC5883 0x1e
/*
* ADC channels
*
src/drivers/boards/px4-same70xplained-v1/board_config.h
-6
View File
@@ -213,12 +213,6 @@ __BEGIN_DECLS
/* No Onboard Sensors #define PX4_I2C_BUS_ONBOARD 0 */
#define PX4_I2C_BUS_LED PX4_I2C_BUS_EXPANSION
/* Devices on the onboard bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
/* Define the follwoing to output the clock on J500-1 */
//#define GPIO_PCK1 (GPIO_PERIPHB | GPIO_CFG_DEFAULT | GPIO_PORT_PIOA | GPIO_PIN17)
src/drivers/boards/px4fmu-v2/board_config.h
-6
View File
@@ -222,12 +222,6 @@
#define PX4_I2C_BUS_ONBOARD 2
#define PX4_I2C_BUS_LED PX4_I2C_BUS_ONBOARD
/* Devices on the onboard bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
/*----------------------------------------------------------*/
/* FMUv3 Cube SPI chip selects and DRDY */
/*----------------------------------------------------------*/
src/drivers/boards/px4fmu-v4/board_config.h
-1
View File
@@ -162,7 +162,6 @@
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
#define PX4_I2C_OBDEV_BMP280 0x76
/*
src/drivers/boards/px4fmu-v4pro/board_config.h
-6
View File
@@ -176,12 +176,6 @@
#define PX4_I2C_BUS_EXPANSION 2
#define PX4_I2C_BUS_LED PX4_I2C_BUS_ONBOARD
/* Devices on the external bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
/*
* ADC channels
*
src/drivers/boards/px4fmu-v5/board_config.h
-7
View File
@@ -236,13 +236,6 @@
#define BOARD_NUMBER_I2C_BUSES 4
#define BOARD_I2C_BUS_CLOCK_INIT {100000, 100000, 100000, 100000}
/* Devices on the external bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
/*
* ADC channels
*
src/drivers/boards/px4nucleoF767ZI-v1/board_config.h
-6
View File
@@ -161,12 +161,6 @@ __BEGIN_DECLS
#define PX4_I2C_BUS_EXPANSION 4
#define PX4_I2C_BUS_LED PX4_I2C_BUS_EXPANSION
/* Devices on the external bus.
*
* Note that these are unshifted addresses.
*/
#define PX4_I2C_OBDEV_HMC5883 0x1e
/*
* ADC channels
*
src/drivers/boards/tap-v1/board_config.h
-2
View File
@@ -98,8 +98,6 @@
#define PX4_I2C_BUS_SONAR 2
#define PX4_I2C_BUS_EXPANSION 3
#define PX4_I2C_OBDEV_HMC5883 0x1e
#define PX4_I2C_BUS_ONBOARD_HZ 400000
#define PX4_I2C_BUS_SONAR_HZ 400000
#define PX4_I2C_BUS_EXPANSION_HZ 400000
src/drivers/imu/mpu6000/mpu6000_i2c.cpp
+1 -1
View File
@@ -169,4 +169,4 @@ MPU6000_I2C::probe()
return (read(MPUREG_WHOAMI, &whoami, 1) > 0 && (whoami == expected)) ? 0 : -EIO;
}
#endif /* PX4_I2C_OBDEV_HMC5883 */
#endif /* USE_I2C */
src/drivers/magnetometer/hmc5883/hmc5883_i2c.cpp
+1 -5
View File
@@ -59,9 +59,7 @@
#include "board_config.h"
#ifdef PX4_I2C_OBDEV_HMC5883
#define HMC5883L_ADDRESS PX4_I2C_OBDEV_HMC5883
#define HMC5883L_ADDRESS 0x1E
device::Device *HMC5883_I2C_interface(int bus);
@@ -172,5 +170,3 @@ HMC5883_I2C::read(unsigned address, void *data, unsigned count)
uint8_t cmd = address;
return transfer(&cmd, 1, (uint8_t *)data, count);
}
#endif /* PX4_I2C_OBDEV_HMC5883 */