From f3a351f47f2f595e1a5049fb55fa8c2f549a070a Mon Sep 17 00:00:00 2001 From: Wu Date: Wed, 28 Aug 2024 16:37:07 +0800 Subject: [PATCH] AP_HAL_ChibiOS: adjust hwdat files for SPL06 rename --- libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF427/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonH743/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/IFLIGHT_2RAW_H7/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MicoAir405v2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/RadiolinkPIX6/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat | 4 ++-- libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat | 4 ++-- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat index aa029c0acda723..f76f0712381997 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat @@ -132,7 +132,7 @@ FLASH_RESERVE_START_KB 64 IMU BMI270 SPI:bmi270 ROTATION_PITCH_180 # I2C BMP280 or SPL06 -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 BARO BMP280 I2C:0:0x76 # no built-in compass, but probe the i2c bus for all possible diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF427/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF427/hwdef.dat index 5df193ee03de25..e061fe466d73d7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF427/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonF427/hwdef.dat @@ -101,7 +101,7 @@ IMU Invensensev2 SPI:icm20649 ROTATION_NONE IMU Invensensev3 SPI:icm42605 ROTATION_ROLL_180_YAW_90 # Two baro -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 BARO MS56XX I2C:0:0x77 # compass diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonH743/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonH743/hwdef.dat index 9e1c637b83bcc2..6056c0965db6c8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonH743/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlyingMoonH743/hwdef.dat @@ -108,7 +108,7 @@ IMU Invensensev2 SPI:icm20649 ROTATION_NONE IMU Invensensev3 SPI:icm42605 ROTATION_ROLL_180_YAW_90 # Two baro -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 BARO MS56XX I2C:0:0x77 # compass diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 0624b4e0680e4f..a159ce5aa36091 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -148,9 +148,9 @@ define HAL_DEFAULT_INS_FAST_SAMPLE 1 # one BARO BARO BMP280 I2C:0:0x76 -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 define AP_BARO_BACKEND_DEFAULT_ENABLED 0 -define AP_BARO_SPL06_ENABLED 1 +define AP_BARO_SPx06_ENABLED 1 define AP_BARO_BMP280_ENABLED 1 # setup for OSD diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat index 002175646b5109..56cdad82f84f71 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat @@ -134,7 +134,7 @@ define HAL_I2C_INTERNAL_MASK 0 define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # built-in barometer -BARO SPL06 I2C:0:0x77 +BARO SPx06 I2C:0:0x77 # --------------------- ADC --------------------------- diff --git a/libraries/AP_HAL_ChibiOS/hwdef/IFLIGHT_2RAW_H7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/IFLIGHT_2RAW_H7/hwdef.dat index d90fe2e67904ec..205c6f254675ab 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/IFLIGHT_2RAW_H7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/IFLIGHT_2RAW_H7/hwdef.dat @@ -126,7 +126,7 @@ define HAL_GPIO_A_LED_PIN 90 PE4 LED1 OUTPUT LOW GPIO(91) define HAL_GPIO_B_LED_PIN 91 -BARO SPL06 I2C:1:0x76 +BARO SPx06 I2C:1:0x76 # SPI setup SPIDEV imu1 SPI1 DEVID1 GYRO1_CS MODE3 1*MHZ 16*MHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat index 035cac5bbbfff3..07cbdfb2f7c781 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405-2022/hwdef.dat @@ -30,7 +30,7 @@ SPIDEV icm42688 SPI1 DEVID2 MPU6000_CS MODE3 1*MHZ 8*MHZ IMU Invensensev3 SPI:icm42688 ROTATION_ROLL_180_YAW_270 # enable SPL06 baro -BARO SPL06 I2C:0:0x76 -define AP_BARO_SPL06_ENABLED 1 +BARO SPx06 I2C:0:0x76 +define AP_BARO_SPx06_ENABLED 1 define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat index 661909c0d70914..327ad6521fd016 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaH743v4/hwdef.dat @@ -186,7 +186,7 @@ define HAL_LOGGING_DATAFLASH_DRIVER AP_Logger_W25NXX # DPS280 or SPL06 integrated on I2C bus BARO DPS280 I2C:0:0x76 -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 # setup for OSD define OSD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat index 002fad46fd90f8..a94971ebdef6bc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat @@ -145,9 +145,9 @@ define HAL_PROBE_EXTERNAL_I2C_COMPASSES define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # built-in barometer -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 define AP_BARO_BACKEND_DEFAULT_ENABLED 0 -define AP_BARO_SPL06_ENABLED 1 +define AP_BARO_SPx06_ENABLED 1 # --------------------- ADC --------------------------- diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat index ded7e7d7a51db9..621eec89f63e41 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekL431-Periph/hwdef.dat @@ -40,7 +40,7 @@ COMPASS QMC5883L I2C:0:0xd false ROTATION_PITCH_180_YAW_90 define HAL_PERIPH_ENABLE_BARO define HAL_BARO_ALLOW_INIT_NO_BARO -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 # ------------------ I2C airspeed ------------------------- define HAL_PERIPH_ENABLE_AIRSPEED diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MicoAir405v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MicoAir405v2/hwdef.dat index 4f24d3a9c1f7ab..5722fad9f24b90 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MicoAir405v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MicoAir405v2/hwdef.dat @@ -132,7 +132,7 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # imu & baro IMU BMI088 SPI:bmi088_a SPI:bmi088_g ROTATION_ROLL_180_YAW_270 -BARO SPL06 SPI:spl06 +BARO SPx06 SPI:spl06 # SPI devices SPIDEV osd SPI1 DEVID4 AT7456E_CS MODE0 10*MHZ 10*MHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat index 4104297370918a..53e50114064318 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/R9Pilot/hwdef.dat @@ -169,7 +169,7 @@ define HAL_DEFAULT_INS_FAST_SAMPLE 3 # one BARO, multiple possible choices for different # board variants -BARO SPL06 SPI:spl06 +BARO SPx06 SPI:spl06 # dummy for testing # BARO Dummy diff --git a/libraries/AP_HAL_ChibiOS/hwdef/RadiolinkPIX6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/RadiolinkPIX6/hwdef.dat index 82c7d676b1c446..bf0ef811ae8c42 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/RadiolinkPIX6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/RadiolinkPIX6/hwdef.dat @@ -186,8 +186,8 @@ define HAL_COMPASS_DISABLE_IST8310_INTERNAL_PROBE COMPASS IST8310 I2C:ALL_INTERNAL:0x0E false ROTATION_YAW_180 # one baro -BARO SPL06 I2C:0:0x76 -BARO SPA06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 +define SPx06_BACKGROUND_ENABLE # microSD support PC8 SDMMC_D0 SDMMC1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat index f063295ea6d73d..c934e06aad4830 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405WING/hwdef.dat @@ -137,9 +137,9 @@ IMU Invensensev3 SPI:icm42605 ROTATION_ROLL_180_YAW_270 define HAL_DEFAULT_INS_FAST_SAMPLE 1 # one baro -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 define AP_BARO_BACKEND_DEFAULT_ENABLED 0 -define AP_BARO_SPL06_ENABLED 1 +define AP_BARO_SPx06_ENABLED 1 # no built-in compass, but probe the i2c bus for all possible # external compass types diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat index 752745b3922479..244839eb02ff72 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat @@ -126,9 +126,9 @@ FLASH_RESERVE_START_KB 48 IMU BMI270 SPI:bmi270 ROTATION_ROLL_180 # built-in barometer -BARO SPL06 I2C:0:0x76 +BARO SPx06 I2C:0:0x76 define AP_BARO_BACKEND_DEFAULT_ENABLED 0 -define AP_BARO_SPL06_ENABLED 1 +define AP_BARO_SPx06_ENABLED 1 # no built-in compass, but probe the i2c bus for all possible # external compass types diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat index 80e58d65d90f08..4040475b91005f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat @@ -134,8 +134,8 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # Barometer setup define AP_BARO_BACKEND_DEFAULT_ENABLED 0 -define AP_BARO_SPL06_ENABLED 1 -BARO SPL06 I2C:0:0x76 +define AP_BARO_SPx06_ENABLED 1 +BARO SPx06 I2C:0:0x76 # IMU setup SPIDEV imu1 SPI1 DEVID1 GYRO1_CS MODE3 1*MHZ 8*MHZ