HAL_ChibiOS: convert remaining boards to use COMPASS specifier

6 years ago · c2c8702329
3 changed files with 4 additions and 11 deletions
--- 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
				@@ -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
--- 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
				@@ -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
--- 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
				@@ -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