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

deprecate df_hmc5883_wrapper and replace with in tree hmc5883

Browse Source 
- deprecate DriverFramework hmc5883 driver (df_hmc5883_wrapper)
 - update aerotenna ocpoc and snapdragon flight eagle boards to use in tree hmc5883
This commit is contained in:
Daniel Agar
2020-01-05 15:17:26 -05:00
parent 7241eebd80
commit ce1e9762b0
17 changed files with 60 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/aerotenna/ocpoc/default.cmake
+8 -1
View File
@@ -7,6 +7,14 @@ px4_add_board(
ARCHITECTURE cortex-a9
TOOLCHAIN arm-linux-gnueabihf
TESTING
SERIAL_PORTS
GPS1:/dev/ttyS3 # GPS/Compass #1 (OcPoC Port 6)
GPS2:/dev/ttyS7 # GPS/Compass #2 (OcPoC Port 7)
GPS3:/dev/ttyS1 # GPS/Compass #3 (OcPoC Port 9)
TEL1:/dev/ttyPS1 # Radio Telemetry (OcPoC Port 4)
TEL2:/dev/ttyS6 # uLanding Radar Altimeter (OcPoC Port 8)
TEL3:/dev/ttyS2 # (OcPoC Port 2)
TEL4:/dev/ttyS0 # uSharp-Patch (OcPoC Port 5)
DRIVERS
#barometer # all available barometer drivers
barometer/ms5611
@@ -26,7 +34,6 @@ px4_add_board(
pwm_out_sim
#telemetry # all available telemetry drivers
DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers
hmc5883
mpu9250
MODULES
airspeed_selector
boards/aerotenna/ocpoc/src/board_config.h
+21 -7
View File
@@ -34,7 +34,7 @@
/**
* @file board_config.h
*
* OCPOC internal definitions
* Aerotenna Ocpoc internal definitions
*/
#pragma once
@@ -43,22 +43,36 @@
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_OCPOC
#define BOARD_BATTERY1_V_DIV (10.177939394f)
#define BOARD_HAS_NO_RESET
#define BOARD_HAS_NO_BOOTLOADER
#define BOARD_NUMBER_I2C_BUSES 4
#define BOARD_MAX_LEDS 1 // Number of external LED's this board has
/*
* I2C busses
*/
#define PX4_I2C_BUS_EXPANSION 2 // i2c-2: Air Data Probe or I2C Splitter
#define PX4_I2C_BUS_EXPANSION1 4 // i2c-4: GPS/Compass #1
#define PX4_I2C_BUS_EXPANSION2 5 // i2c-5: GPS/Compass #2
#define PX4_I2C_BUS_EXPANSION3 3 // i2c-3: GPS/Compass #3
#define PX4_NUMBER_I2C_BUSES 4
#define PX4_I2C_BUS_LED 1
#define PX4_I2C_BUS_EXPANSION 1
// SPI
#define PX4_SPI_BUS_SENSORS 1
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 0) // spidev1.0 - mpu9250
#define PX4_SPIDEV_BARO PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1) // spidev1.1 - ms5611
//#define PX4_SPIDEV_MPU2 PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 2) // TODO: where is the 2nd mpu9250?
#define PX4_SPI_BUS_BARO PX4_SPI_BUS_SENSORS
// Battery ADC channels
#define ADC_BATTERY_VOLTAGE_CHANNEL 10
#define ADC_BATTERY_CURRENT_CHANNEL ((uint8_t)(-1))
#define ADC_AIRSPEED_VOLTAGE_CHANNEL 11
// SPI
#define PX4_SPI_BUS_SENSORS 1
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1)
#include <system_config.h>
#include <px4_platform_common/board_common.h>
boards/atlflight/eagle/qurt-default.cmake
-1
View File
@@ -52,7 +52,6 @@ px4_add_board(
snapdragon_pwm_out
spektrum_rc
DF_DRIVERS
hmc5883
isl29501
ltc2946
mpu9250
boards/atlflight/eagle/src/board_config.h
+4 -2
View File
@@ -57,8 +57,10 @@
#define PX4_I2C_OBDEV_BMP280 0x76
// SPI
#define PX4_SPI_BUS_SENSORS 1
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1)
#define PX4_SPI_BUS_SENSORS 1
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1) // spi-1 - mpu9250
// Battery ADC channels
#include <system_config.h>
#include <px4_platform_common/board_common.h>
boards/atlflight/excelsior/qurt-default.cmake
-1
View File
@@ -52,7 +52,6 @@ px4_add_board(
snapdragon_pwm_out
spektrum_rc
DF_DRIVERS
hmc5883
isl29501
ltc2946
mpu9250
boards/emlid/navio2/default.cmake
-1
View File
@@ -25,7 +25,6 @@ px4_add_board(
pwm_out_sim
#telemetry # all available telemetry drivers
DF_DRIVERS # NOTE: DriverFramework is migrating to intree PX4 drivers
hmc5883
isl29501
lsm9ds1
mpu9250
boards/emlid/navio2/src/board_config.h
+13 -8
View File
@@ -34,7 +34,7 @@
/**
* @file board_config.h
*
* Emlid Navio2 RPI internal definitions
* Emlid Navio2 internal definitions
*/
#pragma once
@@ -42,9 +42,6 @@
#define BOARD_OVERRIDE_UUID "RPIID00000000000" // must be of length 16
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_RPI
#define ADC_BATTERY_VOLTAGE_CHANNEL 2
#define ADC_BATTERY_CURRENT_CHANNEL 3
#define BOARD_BATTERY1_V_DIV (10.177939394f)
#define BOARD_BATTERY1_A_PER_V (15.391030303f)
@@ -56,12 +53,20 @@
/*
* I2C busses
*/
#define PX4_I2C_BUS_EXPANSION 1
#define PX4_NUMBER_I2C_BUSES 1
#define PX4_I2C_BUS_EXPANSION 1
#define PX4_NUMBER_I2C_BUSES 1
// SPI
#define PX4_SPI_BUS_SENSORS 0
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1)
#define PX4_SPI_BUS_SENSORS 0
#define PX4_SPIDEV_UBLOX PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 0) // spidev0.0 - ublox m8n
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 1) // spidev0.1 - mpu9250
#define PX4_SPIDEV_LSM9DS1_M PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 2) // spidev0.2 - lsm9ds1 mag
#define PX4_SPIDEV_LSM9DS1_AG PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 3) // spidev0.3 - lsm9ds1 accel/gyro
// Battery ADC channels
#define ADC_BATTERY_VOLTAGE_CHANNEL 2
#define ADC_BATTERY_CURRENT_CHANNEL 3
#include <system_config.h>
#include <px4_platform_common/board_common.h>
boards/px4/raspberrypi/default.cmake
+1 -1
View File
@@ -28,7 +28,7 @@ px4_add_board(
MODULES
airspeed_selector
attitude_estimator_q
battery_status
#battery_status
camera_feedback
commander
dataman
boards/px4/raspberrypi/src/board_config.h
+5 -8
View File
@@ -48,17 +48,14 @@
/*
* I2C busses
*/
#define PX4_I2C_BUS_ONBOARD 1
#define PX4_I2C_BUS_EXPANSION 0
#define PX4_I2C_BUS_ONBOARD 1
#define PX4_I2C_BUS_EXPANSION 0
#define PX4_NUMBER_I2C_BUSES 2
#define PX4_NUMBER_I2C_BUSES 2
// SPI
#define PX4_SPI_BUS_SENSORS 0
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 0)
#define ADC_BATTERY_VOLTAGE_CHANNEL 0
#define ADC_BATTERY_CURRENT_CHANNEL 1
#define PX4_SPI_BUS_SENSORS 0
#define PX4_SPIDEV_MPU PX4_MK_SPI_SEL(PX4_SPI_BUS_SENSORS, 0) // spidev0.0
#include <system_config.h>
#include <px4_platform_common/board_common.h>