mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-03 06:28:27 -04:00
AP_HAL_ChibiOS: tidy external baro probing
This commit is contained in:
parent
100b8d3915
commit
dafc24b7a1
@ -137,9 +137,6 @@ COMPASS AK8963:probe_mpu9250 0 ROTATION_YAW_90
|
|||||||
define HAL_PROBE_EXTERNAL_I2C_COMPASSES
|
define HAL_PROBE_EXTERNAL_I2C_COMPASSES
|
||||||
define HAL_I2C_INTERNAL_MASK 0
|
define HAL_I2C_INTERNAL_MASK 0
|
||||||
|
|
||||||
# external baro probing
|
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
|
|
||||||
# no onboard SD, filesystem support disabled until flash logging implemented
|
# no onboard SD, filesystem support disabled until flash logging implemented
|
||||||
#define HAL_OS_FATFS_IO 1
|
#define HAL_OS_FATFS_IO 1
|
||||||
#define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
|
#define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS"
|
||||||
|
@ -26,6 +26,5 @@ DMA_PRIORITY USART1* I2C2* TIM1* TIM3*
|
|||||||
NODMA I2C*
|
NODMA I2C*
|
||||||
define STM32_I2C_USE_DMA FALSE
|
define STM32_I2C_USE_DMA FALSE
|
||||||
|
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
define HAL_I2C_INTERNAL_MASK 1
|
define HAL_I2C_INTERNAL_MASK 1
|
||||||
define HAL_FRAME_TYPE_DEFAULT 12
|
define HAL_FRAME_TYPE_DEFAULT 12
|
||||||
|
@ -115,9 +115,8 @@ SPIDEV osd SPI3 DEVID3 OSD_CS MODE0 10*MHZ 10*MHZ
|
|||||||
# One IMU rotated in yaw
|
# One IMU rotated in yaw
|
||||||
IMU Invensense SPI:mpu6000 ROTATION_YAW_90
|
IMU Invensense SPI:mpu6000 ROTATION_YAW_90
|
||||||
|
|
||||||
# Probe for I2C BMP280, but allow external baro
|
# Probe for I2C BMP280
|
||||||
BARO BMP280 I2C:0:0x76
|
BARO BMP280 I2C:0:0x76
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
|
|
||||||
# no built-in compass, but probe the i2c bus for all possible
|
# no built-in compass, but probe the i2c bus for all possible
|
||||||
# external compass types
|
# external compass types
|
||||||
|
@ -134,7 +134,6 @@ IMU Invensense SPI:mpu6000 ROTATION_YAW_180
|
|||||||
|
|
||||||
# one BARO
|
# one BARO
|
||||||
BARO BMP280 I2C:0:0x76
|
BARO BMP280 I2C:0:0x76
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
define HAL_BARO_ALLOW_INIT_NO_BARO
|
define HAL_BARO_ALLOW_INIT_NO_BARO
|
||||||
|
|
||||||
define HAL_OS_FATFS_IO 1
|
define HAL_OS_FATFS_IO 1
|
||||||
@ -165,5 +164,9 @@ define HAL_WITH_MSP_DISPLAYPORT 1
|
|||||||
undef HAL_MSP_ENABLED
|
undef HAL_MSP_ENABLED
|
||||||
define HAL_MSP_ENABLED 1
|
define HAL_MSP_ENABLED 1
|
||||||
|
|
||||||
|
# need to probe external baros even 'though we're minimised:
|
||||||
|
undef AP_BARO_PROBE_EXTERNAL_I2C_BUSES
|
||||||
|
define AP_BARO_PROBE_EXTERNAL_I2C_BUSES 1
|
||||||
|
|
||||||
# reduce max size of embedded params for apj_tool.py
|
# reduce max size of embedded params for apj_tool.py
|
||||||
define AP_PARAM_MAX_EMBEDDED_PARAM 1024
|
define AP_PARAM_MAX_EMBEDDED_PARAM 1024
|
||||||
|
@ -132,7 +132,6 @@ IMU Invensense SPI:mpu6000 ROTATION_YAW_180
|
|||||||
|
|
||||||
# probe for I2C BMP280, but allow init on board variants without onboard baro too
|
# probe for I2C BMP280, but allow init on board variants without onboard baro too
|
||||||
BARO BMP280 I2C:0:0x76
|
BARO BMP280 I2C:0:0x76
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
define HAL_BARO_ALLOW_INIT_NO_BARO
|
define HAL_BARO_ALLOW_INIT_NO_BARO
|
||||||
define AP_BARO_BACKEND_DEFAULT_ENABLED 0
|
define AP_BARO_BACKEND_DEFAULT_ENABLED 0
|
||||||
define AP_BARO_BMP280_ENABLED 1
|
define AP_BARO_BMP280_ENABLED 1
|
||||||
|
@ -34,7 +34,6 @@ define GPS_MAX_INSTANCES 1
|
|||||||
define HAL_COMPASS_MAX_SENSORS 1
|
define HAL_COMPASS_MAX_SENSORS 1
|
||||||
|
|
||||||
# set up for sensors
|
# set up for sensors
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
define HAL_BARO_ALLOW_INIT_NO_BARO
|
define HAL_BARO_ALLOW_INIT_NO_BARO
|
||||||
define HAL_AIRSPEED_BUS_DEFAULT 0
|
define HAL_AIRSPEED_BUS_DEFAULT 0
|
||||||
define AIRSPEED_MAX_SENSORS 1
|
define AIRSPEED_MAX_SENSORS 1
|
||||||
|
@ -97,7 +97,6 @@ IMU Invensense SPI:icm20689_2 ROTATION_NONE
|
|||||||
|
|
||||||
# one baro
|
# one baro
|
||||||
BARO BMP280 I2C:0:0x76
|
BARO BMP280 I2C:0:0x76
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
define HAL_BARO_ALLOW_INIT_NO_BARO
|
define HAL_BARO_ALLOW_INIT_NO_BARO
|
||||||
|
|
||||||
# no built-in compass, but probe the i2c bus for all possible
|
# no built-in compass, but probe the i2c bus for all possible
|
||||||
|
@ -5,7 +5,6 @@ define CAN_APP_NODE_NAME "org.ardupilot.ap_periph_universal"
|
|||||||
|
|
||||||
# and support all external compass and baro types
|
# and support all external compass and baro types
|
||||||
define HAL_PROBE_EXTERNAL_I2C_COMPASSES
|
define HAL_PROBE_EXTERNAL_I2C_COMPASSES
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
|
|
||||||
# enable all features
|
# enable all features
|
||||||
define HAL_PERIPH_ENABLE_GPS
|
define HAL_PERIPH_ENABLE_GPS
|
||||||
|
@ -78,3 +78,6 @@ define AP_BATTERY_SMBUS_NEODESIGN_ENABLED AP_BATTERY_SMBUS_ENABLED
|
|||||||
define AP_BATTERY_SMBUS_SUI_ENABLED AP_BATTERY_SMBUS_ENABLED
|
define AP_BATTERY_SMBUS_SUI_ENABLED AP_BATTERY_SMBUS_ENABLED
|
||||||
define AP_BATTERY_SMBUS_MAXELL_ENABLED AP_BATTERY_SMBUS_ENABLED
|
define AP_BATTERY_SMBUS_MAXELL_ENABLED AP_BATTERY_SMBUS_ENABLED
|
||||||
define AP_BATTERY_SMBUS_ROTOYE_ENABLED AP_BATTERY_SMBUS_ENABLED
|
define AP_BATTERY_SMBUS_ROTOYE_ENABLED AP_BATTERY_SMBUS_ENABLED
|
||||||
|
|
||||||
|
# don't probe for external Barometers:
|
||||||
|
define AP_BARO_PROBE_EXTERNAL_I2C_BUSES 0
|
||||||
|
@ -136,9 +136,6 @@ IMU Invensense SPI:mpu6000 ROTATION_YAW_180
|
|||||||
# one baro
|
# one baro
|
||||||
BARO MS56XX I2C:0:0x77
|
BARO MS56XX I2C:0:0x77
|
||||||
|
|
||||||
# also allow for probing of external barometers
|
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
|
|
||||||
# look for internal I2C compass
|
# look for internal I2C compass
|
||||||
COMPASS HMC5843 I2C:0:0x1E false ROTATION_YAW_270
|
COMPASS HMC5843 I2C:0:0x1E false ROTATION_YAW_270
|
||||||
|
|
||||||
|
@ -117,9 +117,6 @@ IMU Invensense SPI:mpu6000 ROTATION_YAW_180
|
|||||||
# one baro
|
# one baro
|
||||||
BARO MS56XX I2C:0:0x77
|
BARO MS56XX I2C:0:0x77
|
||||||
|
|
||||||
# also allow for probing of external barometers
|
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
|
|
||||||
# look for internal I2C compass
|
# look for internal I2C compass
|
||||||
COMPASS HMC5843 I2C:0:0x1E false ROTATION_YAW_270
|
COMPASS HMC5843 I2C:0:0x1E false ROTATION_YAW_270
|
||||||
|
|
||||||
|
@ -123,7 +123,6 @@ IMU Invensense SPI:mpu6000 ROTATION_YAW_270
|
|||||||
|
|
||||||
# probe for a BMP085, but also look for other baros
|
# probe for a BMP085, but also look for other baros
|
||||||
BARO BMP085 I2C:0:0x77
|
BARO BMP085 I2C:0:0x77
|
||||||
define HAL_PROBE_EXTERNAL_I2C_BAROS
|
|
||||||
define HAL_BARO_ALLOW_INIT_NO_BARO
|
define HAL_BARO_ALLOW_INIT_NO_BARO
|
||||||
|
|
||||||
# no built-in compass, but probe the i2c bus for all possible
|
# no built-in compass, but probe the i2c bus for all possible
|
||||||
|
Loading…
Reference in New Issue
Block a user