From a84042199d4e7514034b3445935ddd4aaa69a351 Mon Sep 17 00:00:00 2001 From: J Blackman Date: Fri, 21 Jun 2024 03:58:25 +1000 Subject: [PATCH] CLEANUP: small adjustment to the legacy gyro directory (#13693) * CLEANUP: small adjustment to the legacy gyro directory * Legacy source explicit declaration. --- mk/source.mk | 6 +++++- .../{accgyro_legacy => accgyro/legacy}/accgyro_adxl345.c | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_adxl345.h | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_bma280.c | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_bma280.h | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_l3g4200d.c | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_l3g4200d.h | 0 .../legacy}/accgyro_lsm303dlhc.c | 0 .../legacy}/accgyro_lsm303dlhc.h | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_mma845x.c | 0 .../{accgyro_legacy => accgyro/legacy}/accgyro_mma845x.h | 0 src/main/sensors/acceleration_init.c | 8 ++++---- src/main/sensors/gyro_init.c | 2 +- 13 files changed, 10 insertions(+), 6 deletions(-) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_adxl345.c (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_adxl345.h (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_bma280.c (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_bma280.h (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_l3g4200d.c (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_l3g4200d.h (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_lsm303dlhc.c (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_lsm303dlhc.h (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_mma845x.c (100%) rename src/main/drivers/{accgyro_legacy => accgyro/legacy}/accgyro_mma845x.h (100%) diff --git a/mk/source.mk b/mk/source.mk index 94e7a163a9..7d2b0bfbf7 100644 --- a/mk/source.mk +++ b/mk/source.mk @@ -220,7 +220,11 @@ LEGACY_GYRO_DEFINES := USE_GYRO_L3GD20 ifneq ($(findstring $(GYRO_DEFINE),$(LEGACY_GYRO_DEFINES)),) COMMON_SRC += \ - $(addprefix drivers/accgyro_legacy/,$(notdir $(wildcard $(SRC_DIR)/drivers/accgyro_legacy/*.c))) + drivers/accgyro/legacy/accgyro_adxl345.c \ + drivers/accgyro/legacy/accgyro_bma280.c \ + drivers/accgyro/legacy/accgyro_l3g4200d.c \ + drivers/accgyro/legacy/accgyro_lsm303dlhc.c \ + drivers/accgyro/legacy/accgyro_mma845x.c endif endif diff --git a/src/main/drivers/accgyro_legacy/accgyro_adxl345.c b/src/main/drivers/accgyro/legacy/accgyro_adxl345.c similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_adxl345.c rename to src/main/drivers/accgyro/legacy/accgyro_adxl345.c diff --git a/src/main/drivers/accgyro_legacy/accgyro_adxl345.h b/src/main/drivers/accgyro/legacy/accgyro_adxl345.h similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_adxl345.h rename to src/main/drivers/accgyro/legacy/accgyro_adxl345.h diff --git a/src/main/drivers/accgyro_legacy/accgyro_bma280.c b/src/main/drivers/accgyro/legacy/accgyro_bma280.c similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_bma280.c rename to src/main/drivers/accgyro/legacy/accgyro_bma280.c diff --git a/src/main/drivers/accgyro_legacy/accgyro_bma280.h b/src/main/drivers/accgyro/legacy/accgyro_bma280.h similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_bma280.h rename to src/main/drivers/accgyro/legacy/accgyro_bma280.h diff --git a/src/main/drivers/accgyro_legacy/accgyro_l3g4200d.c b/src/main/drivers/accgyro/legacy/accgyro_l3g4200d.c similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_l3g4200d.c rename to src/main/drivers/accgyro/legacy/accgyro_l3g4200d.c diff --git a/src/main/drivers/accgyro_legacy/accgyro_l3g4200d.h b/src/main/drivers/accgyro/legacy/accgyro_l3g4200d.h similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_l3g4200d.h rename to src/main/drivers/accgyro/legacy/accgyro_l3g4200d.h diff --git a/src/main/drivers/accgyro_legacy/accgyro_lsm303dlhc.c b/src/main/drivers/accgyro/legacy/accgyro_lsm303dlhc.c similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_lsm303dlhc.c rename to src/main/drivers/accgyro/legacy/accgyro_lsm303dlhc.c diff --git a/src/main/drivers/accgyro_legacy/accgyro_lsm303dlhc.h b/src/main/drivers/accgyro/legacy/accgyro_lsm303dlhc.h similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_lsm303dlhc.h rename to src/main/drivers/accgyro/legacy/accgyro_lsm303dlhc.h diff --git a/src/main/drivers/accgyro_legacy/accgyro_mma845x.c b/src/main/drivers/accgyro/legacy/accgyro_mma845x.c similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_mma845x.c rename to src/main/drivers/accgyro/legacy/accgyro_mma845x.c diff --git a/src/main/drivers/accgyro_legacy/accgyro_mma845x.h b/src/main/drivers/accgyro/legacy/accgyro_mma845x.h similarity index 100% rename from src/main/drivers/accgyro_legacy/accgyro_mma845x.h rename to src/main/drivers/accgyro/legacy/accgyro_mma845x.h diff --git a/src/main/sensors/acceleration_init.c b/src/main/sensors/acceleration_init.c index 7aaa9a4809..01fab48b14 100644 --- a/src/main/sensors/acceleration_init.c +++ b/src/main/sensors/acceleration_init.c @@ -54,19 +54,19 @@ #include "drivers/accgyro/accgyro_spi_lsm6dsv16x.h" #ifdef USE_ACC_ADXL345 -#include "drivers/accgyro_legacy/accgyro_adxl345.h" +#include "drivers/accgyro/legacy/accgyro_adxl345.h" #endif #ifdef USE_ACC_BMA280 -#include "drivers/accgyro_legacy/accgyro_bma280.h" +#include "drivers/accgyro/legacy/accgyro_bma280.h" #endif #ifdef USE_ACC_LSM303DLHC -#include "drivers/accgyro_legacy/accgyro_lsm303dlhc.h" +#include "drivers/accgyro/legacy/accgyro_lsm303dlhc.h" #endif #ifdef USE_ACC_MMA8452 -#include "drivers/accgyro_legacy/accgyro_mma845x.h" +#include "drivers/accgyro/legacy/accgyro_mma845x.h" #endif #include "drivers/bus_spi.h" diff --git a/src/main/sensors/gyro_init.c b/src/main/sensors/gyro_init.c index 1dab8fb353..7b74540b98 100644 --- a/src/main/sensors/gyro_init.c +++ b/src/main/sensors/gyro_init.c @@ -56,7 +56,7 @@ #endif #ifdef USE_GYRO_L3G4200D -#include "drivers/accgyro_legacy/accgyro_l3g4200d.h" +#include "drivers/accgyro/legacy/accgyro_l3g4200d.h" #endif #include "drivers/accgyro/gyro_sync.h"