HAL_ChibiOS: convert more boards to use BARO specifier

6 years ago · 72494788f7
4 changed files with 8 additions and 4 deletions
--- a/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/Durandal/hwdef.dat
@ -315,7 +315,8 @@ define HAL_WITH_RAMTRON 1
				@@ -315,7 +315,8 @@ define HAL_WITH_RAMTRON 1
 # allow to have have a dedicated safety switch pin
 define HAL_HAVE_SAFETY_SWITCH 1

-define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
+# one baro
+BARO MS56XX SPI:ms5611

 define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2
--- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat
@ -135,7 +135,8 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
				@@ -135,7 +135,8 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES
 define HAL_I2C_INTERNAL_MASK 0
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2

-define HAL_BARO_DEFAULT HAL_BARO_BMP280_SPI
+# one baro
+BARO BMP280 SPI:bmp280

 define OSD_ENABLED ENABLED
 define HAL_OSD_TYPE_DEFAULT 1
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat
@ -312,7 +312,8 @@ define HAL_WITH_RAMTRON 1
				@@ -312,7 +312,8 @@ define HAL_WITH_RAMTRON 1
 # allow to have have a dedicated safety switch pin
 define HAL_HAVE_SAFETY_SWITCH 1

-define HAL_BARO_DEFAULT HAL_BARO_MS5611_SPI
+# one baro
+BARO MS56XX SPI:ms5611

 define HAL_COMPASS_DEFAULT HAL_COMPASS_NONE
 define HAL_COMPASS_AUTO_ROT_DEFAULT 2
--- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
@ -117,7 +117,8 @@ SPIDEV mpu6000 SPI1 DEVID1 MPU6500_CS MODE3 1*MHZ 8*MHZ
				@@ -117,7 +117,8 @@ SPIDEV mpu6000 SPI1 DEVID1 MPU6500_CS MODE3 1*MHZ 8*MHZ
 SPIDEV lps22h  SPI2 DEVID3 LPS22HB_CS MODE3 1*MHZ 10*MHZ
 SPIDEV ramtron SPI2 DEVID4 FRAM_CS    MODE3 8*MHZ 8*MHZ

-define HAL_BARO_DEFAULT HAL_BARO_LPS22H_SPI
+# one baro
+BARO LPS2XH SPI:lps22h

 # one IMU
 IMU Invensense SPI:mpu6000 ROTATION_PITCH_180