From c2c8702329e9776c15dc837394bd05c442124a66 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 2 Sep 2019 10:09:00 +1000 Subject: [PATCH] HAL_ChibiOS: convert remaining boards to use COMPASS specifier --- libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat | 7 ++----- .../AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat | 4 +--- libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat | 4 +--- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index ce48ae562d..c6e5f4bc86 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat @@ -137,13 +137,10 @@ IMU Invensense SPI:mpu9250 ROTATION_YAW_90 # one baro BARO BMP280 SPI:bmp280 -# probe external compasses -define ALLOW_ARM_NO_COMPASS -define HAL_COMPASS_DEFAULT HAL_COMPASS_AK8963_MPU9250 -define HAL_COMPASS_AK8963_MPU9250_ROTATION ROTATION_YAW_90 +# probe external compasses plus one in 9250 +COMPASS AK8963:probe_mpu9250 0 ROTATION_YAW_90 define HAL_PROBE_EXTERNAL_I2C_COMPASSES define HAL_I2C_INTERNAL_MASK 0 -define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # external baro probing define HAL_PROBE_EXTERNAL_I2C_BAROS diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat index 25e0697c74..d711d426d5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412-rev1/hwdef.dat @@ -129,9 +129,7 @@ define LAND_DETECTOR_ACCEL_MAX 2.0f define CHIBIOS_ADC_MAVLINK_DEBUG 1 -define HAL_COMPASS_DEFAULT HAL_COMPASS_BMM150_I2C -define HAL_COMPASS_BMM150_I2C_BUS 0 -define HAL_COMPASS_BMM150_I2C_ADDR 0x10 +COMPASS BMM150 I2C:0:0x10 ROTATION_NONE define HAL_BARO_DEFAULT HAL_BARO_20789_I2C_SPI define HAL_BARO_20789_I2C_BUS 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat index 2f601ea134..f38f023f63 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/hwdef.dat @@ -120,9 +120,7 @@ define ALLOW_ARM_NO_COMPASS define CHIBIOS_ADC_MAVLINK_DEBUG 1 -define HAL_COMPASS_DEFAULT HAL_COMPASS_BMM150_I2C -define HAL_COMPASS_BMM150_I2C_BUS 0 -define HAL_COMPASS_BMM150_I2C_ADDR 0x10 +COMPASS BMM150 I2C:0:0x10 ROTATION_NONE define HAL_BARO_DEFAULT HAL_BARO_20789_I2C_I2C define HAL_BARO_20789_I2C_BUS 1