From 9a2d9898ba0688e56631ef65ca42718c96ade1ca Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 19 Nov 2021 09:37:31 +1100 Subject: [PATCH] AP_HAL_ChibiOS: eliminate HAL_LOGGING_DATAFLASH This define didn't add anything over HAL_LOGGING_DATAFLASH_ENABLED - and predates it. --- libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat index 584cd066ab..907d10f071 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat @@ -109,7 +109,7 @@ define HAL_STORAGE_SIZE 16384 STORAGE_FLASH_PAGE 1 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # spi devices SPIDEV mpu6000 SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 4*MHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat index 34d6fa22a3..6d3b8d6e5b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastH7/hwdef.dat @@ -114,7 +114,7 @@ STORAGE_FLASH_PAGE 14 FLASH_RESERVE_END_KB 256 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # spi devices SPIDEV mpu6000 SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 4*MHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 67600b9e0e..6e9b969a08 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -124,7 +124,7 @@ define HAL_STORAGE_SIZE 16384 STORAGE_FLASH_PAGE 1 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # spi devices SPIDEV dataflash SPI1 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat index fadc11dc33..62e04c885c 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat @@ -142,7 +142,7 @@ IMU Invensense SPI:mpu6000 ROTATION_YAW_180 BARO BMP280 I2C:0:0x76 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # setup for OSD define OSD_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat index 1cd10a7757..87b56ec472 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat @@ -124,7 +124,7 @@ define HAL_STORAGE_SIZE 16384 STORAGE_FLASH_PAGE 1 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # spi devices SPIDEV mpu6000 SPI4 DEVID1 ICM20689_CS MODE3 1*MHZ 4*MHZ diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat index f5fef096d4..8bcdcbfae3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat @@ -132,7 +132,7 @@ define HAL_I2C_INTERNAL_MASK 0 define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_STORAGE_SIZE 16384 STORAGE_FLASH_PAGE 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat index 967900d040..bd82178e30 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat @@ -128,7 +128,7 @@ define HAL_I2C_INTERNAL_MASK 0 define HAL_COMPASS_AUTO_ROT_DEFAULT 2 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_STORAGE_SIZE 16384 STORAGE_FLASH_PAGE 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat index 28bfdad550..459f376692 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat @@ -108,7 +108,7 @@ SPIDEV osd SPI3 DEVID4 OSD_CS MODE0 10*MHZ 10*MHZ SPIDEV dataflash SPI2 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # one IMU IMU Invensense SPI:mpu6000 ROTATION_YAW_90 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat index 0ca74d68a2..cb392c0463 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat @@ -112,7 +112,7 @@ STORAGE_FLASH_PAGE 1 define HAL_STORAGE_SIZE 15360 # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # define default battery setup define HAL_BATT_VOLT_PIN 12 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index 9929cb5c79..2663d7f384 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -75,7 +75,7 @@ SPIDEV mpu6000 SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 8*MHZ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # one IMU IMU Invensense SPI:mpu6000_cs ROTATION_YAW_180 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat index fbc3770557..9ebe6af94e 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat @@ -112,7 +112,7 @@ SPIDEV osd SPI3 DEVID4 OSD_CS MODE0 10*MHZ 10*MHZ SPIDEV dataflash SPI2 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # one IMU IMU Invensense SPI:mpu6000 ROTATION_YAW_90 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat index 795bb5c859..ff7eb5c0c6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat @@ -147,6 +147,6 @@ SPIDEV mpu6000 SPI1 DEVID1 MPU_CS MODE3 1*MHZ 8*MHZ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_WITH_DSP FALSE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat index 73c809ef76..497db452ee 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat @@ -128,7 +128,7 @@ SPIDEV mpu6000 SPI1 DEVID1 MPU_CS MODE3 1*MHZ 8*MHZ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_WITH_DSP FALSE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index 51940e749c..8bc0e9b7e7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -132,7 +132,7 @@ SPIDEV mpu9250 SPI1 DEVID4 MPU_CS MODE3 1*MHZ 4*MHZ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 define STM32_PWM_USE_ADVANCED TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat index ad15ae497e..dbc2000ae2 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat @@ -140,7 +140,7 @@ SPIDEV osd SPI2 DEVID1 MAX7456_CS MODE0 10*MHZ 10*MHZ SPIDEV dataflash SPI3 DEVID1 FLASH_CS MODE3 32*MHZ 32*MHZ # enable logging to dataflash -define HAL_LOGGING_DATAFLASH +define HAL_LOGGING_DATAFLASH_ENABLED 1 # setup for OSD define OSD_ENABLED 1