diff --git a/Makefile b/Makefile index eafe82f7ad..70cb2f55d7 100644 --- a/Makefile +++ b/Makefile @@ -955,7 +955,7 @@ STM32F30x_COMMON_SRC = \ STM32F4xx_COMMON_SRC = \ target/system_stm32f4xx.c \ - drivers/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu.c \ drivers/adc_stm32f4xx.c \ drivers/bus_i2c_stm32f10x.c \ drivers/dma_stm32f4xx.c \ @@ -969,7 +969,7 @@ STM32F4xx_COMMON_SRC = \ STM32F7xx_COMMON_SRC = \ target/system_stm32f7xx.c \ - drivers/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu.c \ drivers/adc_stm32f7xx.c \ drivers/bus_i2c_hal.c \ drivers/dma_stm32f7xx.c \ diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 1c66e2826f..6d757f5867 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -40,7 +40,7 @@ #include "config/parameter_group_ids.h" #include "drivers/sensor.h" -#include "drivers/compass.h" +#include "drivers/compass/compass.h" #include "drivers/system.h" #include "drivers/pwm_output.h" diff --git a/src/main/drivers/accgyro/accMpu6000.cpp b/src/main/drivers/accgyro/accMpu6000.cpp new file mode 100644 index 0000000000..c449af5df4 --- /dev/null +++ b/src/main/drivers/accgyro/accMpu6000.cpp @@ -0,0 +1,10 @@ +/* + * accMpu6000.cpp + * + * Created on: 31 Mar 2017 + * Author: martinbudden + */ + + + + diff --git a/src/main/drivers/accgyro.h b/src/main/drivers/accgyro/accgyro.h similarity index 98% rename from src/main/drivers/accgyro.h rename to src/main/drivers/accgyro/accgyro.h index 5d81168d51..c4a8028d33 100644 --- a/src/main/drivers/accgyro.h +++ b/src/main/drivers/accgyro/accgyro.h @@ -21,7 +21,7 @@ #include "common/axis.h" #include "drivers/exti.h" #include "drivers/sensor.h" -#include "drivers/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_mpu.h" #if defined(SIMULATOR_BUILD) && defined(SIMULATOR_MULTITHREAD) #include #endif diff --git a/src/main/drivers/accgyro_adxl345.c b/src/main/drivers/accgyro/accgyro_adxl345.c similarity index 97% rename from src/main/drivers/accgyro_adxl345.c rename to src/main/drivers/accgyro/accgyro_adxl345.c index 9e2b623b40..1ecaea824c 100644 --- a/src/main/drivers/accgyro_adxl345.c +++ b/src/main/drivers/accgyro/accgyro_adxl345.c @@ -20,10 +20,10 @@ #include -#include "system.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_adxl345.h" diff --git a/src/main/drivers/accgyro_adxl345.h b/src/main/drivers/accgyro/accgyro_adxl345.h similarity index 100% rename from src/main/drivers/accgyro_adxl345.h rename to src/main/drivers/accgyro/accgyro_adxl345.h diff --git a/src/main/drivers/accgyro_bma280.c b/src/main/drivers/accgyro/accgyro_bma280.c similarity index 97% rename from src/main/drivers/accgyro_bma280.c rename to src/main/drivers/accgyro/accgyro_bma280.c index f65b22286a..f18df0eac1 100644 --- a/src/main/drivers/accgyro_bma280.c +++ b/src/main/drivers/accgyro/accgyro_bma280.c @@ -20,9 +20,9 @@ #include -#include "bus_i2c.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_bma280.h" diff --git a/src/main/drivers/accgyro_bma280.h b/src/main/drivers/accgyro/accgyro_bma280.h similarity index 100% rename from src/main/drivers/accgyro_bma280.h rename to src/main/drivers/accgyro/accgyro_bma280.h diff --git a/src/main/drivers/accgyro_fake.c b/src/main/drivers/accgyro/accgyro_fake.c similarity index 97% rename from src/main/drivers/accgyro_fake.c rename to src/main/drivers/accgyro/accgyro_fake.c index ece9224215..9c60e743cf 100644 --- a/src/main/drivers/accgyro_fake.c +++ b/src/main/drivers/accgyro/accgyro_fake.c @@ -30,8 +30,8 @@ #include "common/axis.h" #include "common/utils.h" -#include "accgyro.h" -#include "accgyro_fake.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_fake.h" static int16_t fakeGyroADC[XYZ_AXIS_COUNT]; gyroDev_t *fakeGyroDev; diff --git a/src/main/drivers/accgyro_fake.h b/src/main/drivers/accgyro/accgyro_fake.h similarity index 100% rename from src/main/drivers/accgyro_fake.h rename to src/main/drivers/accgyro/accgyro_fake.h diff --git a/src/main/drivers/accgyro_l3g4200d.c b/src/main/drivers/accgyro/accgyro_l3g4200d.c similarity index 97% rename from src/main/drivers/accgyro_l3g4200d.c rename to src/main/drivers/accgyro/accgyro_l3g4200d.c index 170bb0fe71..9c3cfa475a 100644 --- a/src/main/drivers/accgyro_l3g4200d.c +++ b/src/main/drivers/accgyro/accgyro_l3g4200d.c @@ -20,13 +20,13 @@ #include -#include "system.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/bus_i2c.h" #include "common/maths.h" #include "common/axis.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_l3g4200d.h" diff --git a/src/main/drivers/accgyro_l3g4200d.h b/src/main/drivers/accgyro/accgyro_l3g4200d.h similarity index 100% rename from src/main/drivers/accgyro_l3g4200d.h rename to src/main/drivers/accgyro/accgyro_l3g4200d.h diff --git a/src/main/drivers/accgyro_l3gd20.c b/src/main/drivers/accgyro/accgyro_l3gd20.c similarity index 97% rename from src/main/drivers/accgyro_l3gd20.c rename to src/main/drivers/accgyro/accgyro_l3gd20.c index 12f83e5198..fec1c9cfb7 100644 --- a/src/main/drivers/accgyro_l3gd20.c +++ b/src/main/drivers/accgyro/accgyro_l3gd20.c @@ -24,11 +24,11 @@ #include "common/maths.h" -#include "system.h" -#include "io.h" -#include "bus_spi.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_l3gd20.h" diff --git a/src/main/drivers/accgyro_l3gd20.h b/src/main/drivers/accgyro/accgyro_l3gd20.h similarity index 100% rename from src/main/drivers/accgyro_l3gd20.h rename to src/main/drivers/accgyro/accgyro_l3gd20.h diff --git a/src/main/drivers/accgyro_lsm303dlhc.c b/src/main/drivers/accgyro/accgyro_lsm303dlhc.c similarity index 97% rename from src/main/drivers/accgyro_lsm303dlhc.c rename to src/main/drivers/accgyro/accgyro_lsm303dlhc.c index ade701a38f..71a5c63f1c 100644 --- a/src/main/drivers/accgyro_lsm303dlhc.c +++ b/src/main/drivers/accgyro/accgyro_lsm303dlhc.c @@ -27,11 +27,11 @@ #include "common/maths.h" #include "common/axis.h" -#include "system.h" -#include "io.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_lsm303dlhc.h" diff --git a/src/main/drivers/accgyro_lsm303dlhc.h b/src/main/drivers/accgyro/accgyro_lsm303dlhc.h similarity index 100% rename from src/main/drivers/accgyro_lsm303dlhc.h rename to src/main/drivers/accgyro/accgyro_lsm303dlhc.h diff --git a/src/main/drivers/accgyro_mma845x.c b/src/main/drivers/accgyro/accgyro_mma845x.c similarity index 97% rename from src/main/drivers/accgyro_mma845x.c rename to src/main/drivers/accgyro/accgyro_mma845x.c index d61e4b666c..2e541755fd 100644 --- a/src/main/drivers/accgyro_mma845x.c +++ b/src/main/drivers/accgyro/accgyro_mma845x.c @@ -20,11 +20,11 @@ #include "platform.h" -#include "system.h" -#include "io.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mma845x.h" diff --git a/src/main/drivers/accgyro_mma845x.h b/src/main/drivers/accgyro/accgyro_mma845x.h similarity index 100% rename from src/main/drivers/accgyro_mma845x.h rename to src/main/drivers/accgyro/accgyro_mma845x.h diff --git a/src/main/drivers/accgyro_mpu.c b/src/main/drivers/accgyro/accgyro_mpu.c similarity index 98% rename from src/main/drivers/accgyro_mpu.c rename to src/main/drivers/accgyro/accgyro_mpu.c index 89884a05be..f1d028f287 100644 --- a/src/main/drivers/accgyro_mpu.c +++ b/src/main/drivers/accgyro/accgyro_mpu.c @@ -29,14 +29,14 @@ #include "common/maths.h" #include "common/utils.h" -#include "nvic.h" +#include "drivers/nvic.h" -#include "system.h" -#include "io.h" -#include "exti.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/exti.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu3050.h" #include "accgyro_mpu6050.h" diff --git a/src/main/drivers/accgyro_mpu.h b/src/main/drivers/accgyro/accgyro_mpu.h similarity index 99% rename from src/main/drivers/accgyro_mpu.h rename to src/main/drivers/accgyro/accgyro_mpu.h index 4ba15bf3f1..8b1ea5063b 100644 --- a/src/main/drivers/accgyro_mpu.h +++ b/src/main/drivers/accgyro/accgyro_mpu.h @@ -17,8 +17,8 @@ #pragma once -#include "exti.h" -#include "sensor.h" +#include "drivers/exti.h" +#include "drivers/sensor.h" //#define DEBUG_MPU_DATA_READY_INTERRUPT diff --git a/src/main/drivers/accgyro_mpu3050.c b/src/main/drivers/accgyro/accgyro_mpu3050.c similarity index 95% rename from src/main/drivers/accgyro_mpu3050.c rename to src/main/drivers/accgyro/accgyro_mpu3050.c index d5ed95f90a..d97a35b068 100644 --- a/src/main/drivers/accgyro_mpu3050.c +++ b/src/main/drivers/accgyro/accgyro_mpu3050.c @@ -23,11 +23,11 @@ #include "common/maths.h" #include "common/utils.h" -#include "system.h" -#include "exti.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/exti.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu.h" #include "accgyro_mpu3050.h" diff --git a/src/main/drivers/accgyro_mpu3050.h b/src/main/drivers/accgyro/accgyro_mpu3050.h similarity index 100% rename from src/main/drivers/accgyro_mpu3050.h rename to src/main/drivers/accgyro/accgyro_mpu3050.h diff --git a/src/main/drivers/accgyro_mpu6050.c b/src/main/drivers/accgyro/accgyro_mpu6050.c similarity index 95% rename from src/main/drivers/accgyro_mpu6050.c rename to src/main/drivers/accgyro/accgyro_mpu6050.c index e57837f373..55898a74fb 100644 --- a/src/main/drivers/accgyro_mpu6050.c +++ b/src/main/drivers/accgyro/accgyro_mpu6050.c @@ -26,15 +26,15 @@ #include "common/maths.h" #include "common/utils.h" -#include "nvic.h" +#include "drivers/nvic.h" -#include "system.h" -#include "gpio.h" -#include "exti.h" -#include "bus_i2c.h" -#include "gyro_sync.h" +#include "drivers/system.h" +#include "drivers/gpio.h" +#include "drivers/exti.h" +#include "drivers/bus_i2c.h" +#include "drivers/gyro_sync.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu.h" #include "accgyro_mpu6050.h" diff --git a/src/main/drivers/accgyro_mpu6050.h b/src/main/drivers/accgyro/accgyro_mpu6050.h similarity index 100% rename from src/main/drivers/accgyro_mpu6050.h rename to src/main/drivers/accgyro/accgyro_mpu6050.h diff --git a/src/main/drivers/accgyro_mpu6500.c b/src/main/drivers/accgyro/accgyro_mpu6500.c similarity index 95% rename from src/main/drivers/accgyro_mpu6500.c rename to src/main/drivers/accgyro/accgyro_mpu6500.c index 995ee26587..af2d5d8f66 100644 --- a/src/main/drivers/accgyro_mpu6500.c +++ b/src/main/drivers/accgyro/accgyro_mpu6500.c @@ -24,12 +24,12 @@ #include "common/axis.h" #include "common/maths.h" -#include "system.h" -#include "exti.h" -#include "gpio.h" -#include "gyro_sync.h" +#include "drivers/system.h" +#include "drivers/exti.h" +#include "drivers/gpio.h" +#include "drivers/gyro_sync.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu.h" #include "accgyro_mpu6500.h" diff --git a/src/main/drivers/accgyro_mpu6500.h b/src/main/drivers/accgyro/accgyro_mpu6500.h similarity index 100% rename from src/main/drivers/accgyro_mpu6500.h rename to src/main/drivers/accgyro/accgyro_mpu6500.h diff --git a/src/main/drivers/accgyro_spi_bmi160.c b/src/main/drivers/accgyro/accgyro_spi_bmi160.c similarity index 98% rename from src/main/drivers/accgyro_spi_bmi160.c rename to src/main/drivers/accgyro/accgyro_spi_bmi160.c index 854bead6cc..ee7a9c49ed 100644 --- a/src/main/drivers/accgyro_spi_bmi160.c +++ b/src/main/drivers/accgyro/accgyro_spi_bmi160.c @@ -37,13 +37,13 @@ #include "platform.h" -#include "system.h" -#include "io.h" -#include "exti.h" -#include "nvic.h" -#include "bus_spi.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/exti.h" +#include "drivers/nvic.h" +#include "drivers/bus_spi.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_spi_bmi160.h" diff --git a/src/main/drivers/accgyro_spi_bmi160.h b/src/main/drivers/accgyro/accgyro_spi_bmi160.h similarity index 98% rename from src/main/drivers/accgyro_spi_bmi160.h rename to src/main/drivers/accgyro/accgyro_spi_bmi160.h index 79dd7e9199..fad3dcd0bf 100644 --- a/src/main/drivers/accgyro_spi_bmi160.h +++ b/src/main/drivers/accgyro/accgyro_spi_bmi160.h @@ -34,7 +34,7 @@ #pragma once -#include "sensor.h" +#include "drivers/sensor.h" enum pios_bmi160_orientation { // clockwise rotation from board forward PIOS_BMI160_TOP_0DEG, diff --git a/src/main/drivers/accgyro_spi_icm20689.c b/src/main/drivers/accgyro/accgyro_spi_icm20689.c similarity index 96% rename from src/main/drivers/accgyro_spi_icm20689.c rename to src/main/drivers/accgyro/accgyro_spi_icm20689.c index d265d02d94..136fde53f6 100644 --- a/src/main/drivers/accgyro_spi_icm20689.c +++ b/src/main/drivers/accgyro/accgyro_spi_icm20689.c @@ -24,14 +24,14 @@ #include "common/axis.h" #include "common/maths.h" -#include "system.h" -#include "exti.h" -#include "io.h" -#include "bus_spi.h" -#include "gpio.h" -#include "gyro_sync.h" +#include "drivers/system.h" +#include "drivers/exti.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" +#include "drivers/gpio.h" +#include "drivers/gyro_sync.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu.h" #include "accgyro_spi_icm20689.h" diff --git a/src/main/drivers/accgyro_spi_icm20689.h b/src/main/drivers/accgyro/accgyro_spi_icm20689.h similarity index 97% rename from src/main/drivers/accgyro_spi_icm20689.h rename to src/main/drivers/accgyro/accgyro_spi_icm20689.h index 5325439328..0a3d862f6e 100644 --- a/src/main/drivers/accgyro_spi_icm20689.h +++ b/src/main/drivers/accgyro/accgyro_spi_icm20689.h @@ -16,7 +16,7 @@ */ #pragma once -#include "sensor.h" +#include "drivers/sensor.h" #define ICM20689_WHO_AM_I_CONST (0x98) #define ICM20689_BIT_RESET (0x80) diff --git a/src/main/drivers/accgyro_spi_mpu6000.c b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c similarity index 97% rename from src/main/drivers/accgyro_spi_mpu6000.c rename to src/main/drivers/accgyro/accgyro_spi_mpu6000.c index b44fa4968b..73b1d51b49 100644 --- a/src/main/drivers/accgyro_spi_mpu6000.c +++ b/src/main/drivers/accgyro/accgyro_spi_mpu6000.c @@ -30,14 +30,14 @@ #include "common/axis.h" #include "common/maths.h" -#include "system.h" -#include "io.h" -#include "exti.h" -#include "bus_spi.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/exti.h" +#include "drivers/bus_spi.h" -#include "gyro_sync.h" +#include "drivers/gyro_sync.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu.h" diff --git a/src/main/drivers/accgyro_spi_mpu6000.h b/src/main/drivers/accgyro/accgyro_spi_mpu6000.h similarity index 96% rename from src/main/drivers/accgyro_spi_mpu6000.h rename to src/main/drivers/accgyro/accgyro_spi_mpu6000.h index 9536d6ee3a..2c0fa464ca 100644 --- a/src/main/drivers/accgyro_spi_mpu6000.h +++ b/src/main/drivers/accgyro/accgyro_spi_mpu6000.h @@ -1,7 +1,7 @@ #pragma once -#include "sensor.h" +#include "drivers/sensor.h" #define MPU6000_CONFIG 0x1A diff --git a/src/main/drivers/accgyro_spi_mpu6500.c b/src/main/drivers/accgyro/accgyro_spi_mpu6500.c similarity index 96% rename from src/main/drivers/accgyro_spi_mpu6500.c rename to src/main/drivers/accgyro/accgyro_spi_mpu6500.c index e1e82e793a..7e8a45deda 100755 --- a/src/main/drivers/accgyro_spi_mpu6500.c +++ b/src/main/drivers/accgyro/accgyro_spi_mpu6500.c @@ -23,12 +23,12 @@ #include "common/axis.h" #include "common/maths.h" -#include "system.h" -#include "exti.h" -#include "io.h" -#include "bus_spi.h" +#include "drivers/system.h" +#include "drivers/exti.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "accgyro.h" #include "accgyro_mpu.h" #include "accgyro_mpu6500.h" diff --git a/src/main/drivers/accgyro_spi_mpu6500.h b/src/main/drivers/accgyro/accgyro_spi_mpu6500.h similarity index 97% rename from src/main/drivers/accgyro_spi_mpu6500.h rename to src/main/drivers/accgyro/accgyro_spi_mpu6500.h index 01d6b29c13..4eea122946 100755 --- a/src/main/drivers/accgyro_spi_mpu6500.h +++ b/src/main/drivers/accgyro/accgyro_spi_mpu6500.h @@ -17,7 +17,7 @@ #pragma once -#include "sensor.h" +#include "drivers/sensor.h" uint8_t mpu6500SpiDetect(const busDevice_t *bus); diff --git a/src/main/drivers/accgyro_spi_mpu9250.c b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c similarity index 95% rename from src/main/drivers/accgyro_spi_mpu9250.c rename to src/main/drivers/accgyro/accgyro_spi_mpu9250.c index 0859776944..a884d77f5b 100644 --- a/src/main/drivers/accgyro_spi_mpu9250.c +++ b/src/main/drivers/accgyro/accgyro_spi_mpu9250.c @@ -33,18 +33,18 @@ #include "common/axis.h" #include "common/maths.h" -#include "io.h" +#include "drivers/io.h" -#include "system.h" -#include "exti.h" -#include "bus_spi.h" -#include "gyro_sync.h" -#include "light_led.h" +#include "drivers/system.h" +#include "drivers/exti.h" +#include "drivers/bus_spi.h" +#include "drivers/gyro_sync.h" +#include "drivers/light_led.h" -#include "sensor.h" -#include "accgyro.h" -#include "accgyro_mpu.h" -#include "accgyro_spi_mpu9250.h" +#include "drivers/sensor.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_spi_mpu9250.h" static void mpu9250AccAndGyroInit(gyroDev_t *gyro); diff --git a/src/main/drivers/accgyro_spi_mpu9250.h b/src/main/drivers/accgyro/accgyro_spi_mpu9250.h similarity index 97% rename from src/main/drivers/accgyro_spi_mpu9250.h rename to src/main/drivers/accgyro/accgyro_spi_mpu9250.h index ab94308adc..14eba13434 100644 --- a/src/main/drivers/accgyro_spi_mpu9250.h +++ b/src/main/drivers/accgyro/accgyro_spi_mpu9250.h @@ -1,7 +1,7 @@ #pragma once -#include "sensor.h" +#include "drivers/sensor.h" #define mpu9250_CONFIG 0x1A diff --git a/src/main/drivers/adc.c b/src/main/drivers/adc.c index 9e86c731de..d8ce0eb9a8 100644 --- a/src/main/drivers/adc.c +++ b/src/main/drivers/adc.c @@ -23,7 +23,7 @@ #include "build/build_config.h" #include "build/debug.h" -#include "system.h" +#include "drivers/system.h" #include "adc.h" #include "adc_impl.h" diff --git a/src/main/drivers/adc.h b/src/main/drivers/adc.h index dceed0a857..53101104e7 100644 --- a/src/main/drivers/adc.h +++ b/src/main/drivers/adc.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" typedef enum { ADC_BATTERY = 0, diff --git a/src/main/drivers/adc_impl.h b/src/main/drivers/adc_impl.h index 56f4032859..539b075c2f 100644 --- a/src/main/drivers/adc_impl.h +++ b/src/main/drivers/adc_impl.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" #include "rcc_types.h" #if defined(STM32F4) || defined(STM32F7) diff --git a/src/main/drivers/adc_stm32f10x.c b/src/main/drivers/adc_stm32f10x.c index f987123c99..221f7e3b57 100644 --- a/src/main/drivers/adc_stm32f10x.c +++ b/src/main/drivers/adc_stm32f10x.c @@ -25,12 +25,12 @@ #include "build/build_config.h" -#include "system.h" -#include "sensor.h" -#include "accgyro.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/system.h" +#include "drivers/sensor.h" #include "adc.h" #include "adc_impl.h" -#include "io.h" +#include "drivers/io.h" #include "rcc.h" #include "dma.h" diff --git a/src/main/drivers/adc_stm32f30x.c b/src/main/drivers/adc_stm32f30x.c index 044b407fe0..49d58a87e9 100644 --- a/src/main/drivers/adc_stm32f30x.c +++ b/src/main/drivers/adc_stm32f30x.c @@ -20,15 +20,16 @@ #include #include "platform.h" -#include "system.h" -#include "gpio.h" -#include "sensor.h" -#include "accgyro.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/system.h" +#include "drivers/gpio.h" + +#include "drivers/sensor.h" #include "adc.h" #include "adc_impl.h" -#include "io.h" +#include "drivers/io.h" #include "rcc.h" #include "dma.h" diff --git a/src/main/drivers/adc_stm32f4xx.c b/src/main/drivers/adc_stm32f4xx.c index 740dfea047..0f4147689c 100644 --- a/src/main/drivers/adc_stm32f4xx.c +++ b/src/main/drivers/adc_stm32f4xx.c @@ -20,15 +20,16 @@ #include #include "platform.h" -#include "system.h" -#include "io.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/system.h" + +#include "drivers/io.h" #include "io_impl.h" #include "rcc.h" #include "dma.h" -#include "sensor.h" -#include "accgyro.h" +#include "drivers/sensor.h" #include "adc.h" #include "adc_impl.h" diff --git a/src/main/drivers/adc_stm32f7xx.c b/src/main/drivers/adc_stm32f7xx.c index 53bf1c0f19..9e2e28d290 100644 --- a/src/main/drivers/adc_stm32f7xx.c +++ b/src/main/drivers/adc_stm32f7xx.c @@ -20,15 +20,16 @@ #include #include "platform.h" -#include "system.h" -#include "io.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/system.h" + +#include "drivers/io.h" #include "io_impl.h" #include "rcc.h" #include "dma.h" -#include "sensor.h" -#include "accgyro.h" +#include "drivers/sensor.h" #include "adc.h" #include "adc_impl.h" diff --git a/src/main/drivers/barometer.h b/src/main/drivers/barometer/barometer.h similarity index 100% rename from src/main/drivers/barometer.h rename to src/main/drivers/barometer/barometer.h diff --git a/src/main/drivers/barometer_bmp085.c b/src/main/drivers/barometer/barometer_bmp085.c similarity index 98% rename from src/main/drivers/barometer_bmp085.c rename to src/main/drivers/barometer/barometer_bmp085.c index 50862ebfcb..a1c36c09b3 100644 --- a/src/main/drivers/barometer_bmp085.c +++ b/src/main/drivers/barometer/barometer_bmp085.c @@ -24,12 +24,12 @@ #include "barometer.h" -#include "gpio.h" -#include "system.h" -#include "bus_i2c.h" -#include "nvic.h" -#include "exti.h" -#include "io.h" +#include "drivers/gpio.h" +#include "drivers/system.h" +#include "drivers/bus_i2c.h" +#include "drivers/nvic.h" +#include "drivers/exti.h" +#include "drivers/io.h" #include "barometer_bmp085.h" diff --git a/src/main/drivers/barometer_bmp085.h b/src/main/drivers/barometer/barometer_bmp085.h similarity index 97% rename from src/main/drivers/barometer_bmp085.h rename to src/main/drivers/barometer/barometer_bmp085.h index 02fc0d8eb3..a750fb22fd 100644 --- a/src/main/drivers/barometer_bmp085.h +++ b/src/main/drivers/barometer/barometer_bmp085.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" typedef struct bmp085Config_s { ioTag_t xclrIO; diff --git a/src/main/drivers/barometer_bmp280.c b/src/main/drivers/barometer/barometer_bmp280.c similarity index 99% rename from src/main/drivers/barometer_bmp280.c rename to src/main/drivers/barometer/barometer_bmp280.c index b034eac3d6..bc079f14c1 100644 --- a/src/main/drivers/barometer_bmp280.c +++ b/src/main/drivers/barometer/barometer_bmp280.c @@ -24,8 +24,8 @@ #include "barometer.h" -#include "system.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/bus_i2c.h" #include "barometer_bmp280.h" #include "barometer_spi_bmp280.h" diff --git a/src/main/drivers/barometer_bmp280.h b/src/main/drivers/barometer/barometer_bmp280.h similarity index 100% rename from src/main/drivers/barometer_bmp280.h rename to src/main/drivers/barometer/barometer_bmp280.h diff --git a/src/main/drivers/barometer_fake.c b/src/main/drivers/barometer/barometer_fake.c similarity index 100% rename from src/main/drivers/barometer_fake.c rename to src/main/drivers/barometer/barometer_fake.c diff --git a/src/main/drivers/barometer_fake.h b/src/main/drivers/barometer/barometer_fake.h similarity index 100% rename from src/main/drivers/barometer_fake.h rename to src/main/drivers/barometer/barometer_fake.h diff --git a/src/main/drivers/barometer_ms5611.c b/src/main/drivers/barometer/barometer_ms5611.c similarity index 98% rename from src/main/drivers/barometer_ms5611.c rename to src/main/drivers/barometer/barometer_ms5611.c index 804291c8f4..70693221fc 100644 --- a/src/main/drivers/barometer_ms5611.c +++ b/src/main/drivers/barometer/barometer_ms5611.c @@ -25,9 +25,9 @@ #include "barometer.h" #include "barometer_spi_ms5611.h" -#include "gpio.h" -#include "system.h" -#include "bus_i2c.h" +#include "drivers/gpio.h" +#include "drivers/system.h" +#include "drivers/bus_i2c.h" // MS5611, Standard address 0x77 #define MS5611_ADDR 0x77 diff --git a/src/main/drivers/barometer_ms5611.h b/src/main/drivers/barometer/barometer_ms5611.h similarity index 100% rename from src/main/drivers/barometer_ms5611.h rename to src/main/drivers/barometer/barometer_ms5611.h diff --git a/src/main/drivers/barometer_spi_bmp280.c b/src/main/drivers/barometer/barometer_spi_bmp280.c similarity index 97% rename from src/main/drivers/barometer_spi_bmp280.c rename to src/main/drivers/barometer/barometer_spi_bmp280.c index 7d6b1af90e..d75e30d10a 100644 --- a/src/main/drivers/barometer_spi_bmp280.c +++ b/src/main/drivers/barometer/barometer_spi_bmp280.c @@ -21,11 +21,11 @@ #include -#include "bus_spi.h" +#include "drivers/bus_spi.h" #include "barometer.h" #include "barometer_bmp280.h" -#include "io.h" +#include "drivers/io.h" #ifdef USE_BARO_SPI_BMP280 #define DISABLE_BMP280 IOHi(bmp280CsPin) diff --git a/src/main/drivers/barometer_spi_bmp280.h b/src/main/drivers/barometer/barometer_spi_bmp280.h similarity index 100% rename from src/main/drivers/barometer_spi_bmp280.h rename to src/main/drivers/barometer/barometer_spi_bmp280.h diff --git a/src/main/drivers/barometer_spi_ms5611.c b/src/main/drivers/barometer/barometer_spi_ms5611.c similarity index 97% rename from src/main/drivers/barometer_spi_ms5611.c rename to src/main/drivers/barometer/barometer_spi_ms5611.c index 700f7c78e3..cb9d27097d 100755 --- a/src/main/drivers/barometer_spi_ms5611.c +++ b/src/main/drivers/barometer/barometer_spi_ms5611.c @@ -20,8 +20,8 @@ #include -#include "io.h" -#include "bus_spi.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" #include "barometer.h" #include "barometer_ms5611.h" diff --git a/src/main/drivers/barometer_spi_ms5611.h b/src/main/drivers/barometer/barometer_spi_ms5611.h similarity index 100% rename from src/main/drivers/barometer_spi_ms5611.h rename to src/main/drivers/barometer/barometer_spi_ms5611.h diff --git a/src/main/drivers/bus_i2c.h b/src/main/drivers/bus_i2c.h index 8f2658b26c..dd5ee8a8ec 100644 --- a/src/main/drivers/bus_i2c.h +++ b/src/main/drivers/bus_i2c.h @@ -19,8 +19,8 @@ #include "platform.h" -#include "io_types.h" -#include "rcc_types.h" +#include "drivers/io_types.h" +#include "drivers/rcc_types.h" #define I2C_SHORT_TIMEOUT ((uint32_t)0x1000) #define I2C_LONG_TIMEOUT ((uint32_t)(10 * I2C_SHORT_TIMEOUT)) diff --git a/src/main/drivers/bus_i2c_hal.c b/src/main/drivers/bus_i2c_hal.c index f82de7099a..8b52e6bed1 100644 --- a/src/main/drivers/bus_i2c_hal.c +++ b/src/main/drivers/bus_i2c_hal.c @@ -20,11 +20,11 @@ #include -#include "io.h" -#include "system.h" +#include "drivers/io.h" +#include "drivers/system.h" -#include "bus_i2c.h" -#include "nvic.h" +#include "drivers/bus_i2c.h" +#include "drivers/nvic.h" #include "io_impl.h" #include "rcc.h" diff --git a/src/main/drivers/bus_i2c_soft.c b/src/main/drivers/bus_i2c_soft.c index 540a139427..938a295632 100644 --- a/src/main/drivers/bus_i2c_soft.c +++ b/src/main/drivers/bus_i2c_soft.c @@ -22,8 +22,8 @@ #include "build/build_config.h" -#include "bus_i2c.h" -#include "io.h" +#include "drivers/bus_i2c.h" +#include "drivers/io.h" // Software I2C driver, using same pins as hardware I2C, with hw i2c module disabled. // Can be configured for I2C2 pinout (SCL: PB10, SDA: PB11) or I2C1 pinout (SCL: PB6, SDA: PB7) diff --git a/src/main/drivers/bus_i2c_stm32f10x.c b/src/main/drivers/bus_i2c_stm32f10x.c index f31f05205d..9c21da0136 100644 --- a/src/main/drivers/bus_i2c_stm32f10x.c +++ b/src/main/drivers/bus_i2c_stm32f10x.c @@ -21,11 +21,11 @@ #include -#include "io.h" -#include "system.h" +#include "drivers/io.h" +#include "drivers/system.h" -#include "bus_i2c.h" -#include "nvic.h" +#include "drivers/bus_i2c.h" +#include "drivers/nvic.h" #include "io_impl.h" #include "rcc.h" diff --git a/src/main/drivers/bus_i2c_stm32f30x.c b/src/main/drivers/bus_i2c_stm32f30x.c index d32085aa3e..3869c179ab 100644 --- a/src/main/drivers/bus_i2c_stm32f30x.c +++ b/src/main/drivers/bus_i2c_stm32f30x.c @@ -20,12 +20,12 @@ #include -#include "system.h" -#include "io.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "io_impl.h" #include "rcc.h" -#include "bus_i2c.h" +#include "drivers/bus_i2c.h" #ifndef SOFT_I2C diff --git a/src/main/drivers/bus_spi.c b/src/main/drivers/bus_spi.c index b411c38457..b5aae9eca2 100644 --- a/src/main/drivers/bus_spi.c +++ b/src/main/drivers/bus_spi.c @@ -20,9 +20,9 @@ #include -#include "bus_spi.h" -#include "exti.h" -#include "io.h" +#include "drivers/bus_spi.h" +#include "drivers/exti.h" +#include "drivers/io.h" #include "io_impl.h" #include "rcc.h" diff --git a/src/main/drivers/bus_spi.h b/src/main/drivers/bus_spi.h index 2b93923d2c..344bb967cf 100644 --- a/src/main/drivers/bus_spi.h +++ b/src/main/drivers/bus_spi.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" #include "rcc_types.h" #if defined(STM32F4) || defined(STM32F3) diff --git a/src/main/drivers/bus_spi_hal.c b/src/main/drivers/bus_spi_hal.c index a20dcdb762..07e3ffcb08 100644 --- a/src/main/drivers/bus_spi_hal.c +++ b/src/main/drivers/bus_spi_hal.c @@ -20,11 +20,11 @@ #include -#include "bus_spi.h" +#include "drivers/bus_spi.h" #include "dma.h" -#include "io.h" +#include "drivers/io.h" #include "io_impl.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "rcc.h" #ifndef SPI1_SCK_PIN diff --git a/src/main/drivers/bus_spi_soft.c b/src/main/drivers/bus_spi_soft.c index 85d7d2454a..2400124dc7 100644 --- a/src/main/drivers/bus_spi_soft.c +++ b/src/main/drivers/bus_spi_soft.c @@ -25,9 +25,9 @@ #include "build/build_config.h" -#include "io.h" +#include "drivers/io.h" #include "io_impl.h" -#include "bus_spi.h" +#include "drivers/bus_spi.h" #include "bus_spi_soft.h" diff --git a/src/main/drivers/bus_spi_soft.h b/src/main/drivers/bus_spi_soft.h index facb0be93b..fe759a2f36 100644 --- a/src/main/drivers/bus_spi_soft.h +++ b/src/main/drivers/bus_spi_soft.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" typedef enum softSPIDevice { SOFT_SPIDEV_1 = 0 diff --git a/src/main/drivers/compass.h b/src/main/drivers/compass/compass.h similarity index 97% rename from src/main/drivers/compass.h rename to src/main/drivers/compass/compass.h index c717365bfc..08ebc1f3c6 100644 --- a/src/main/drivers/compass.h +++ b/src/main/drivers/compass/compass.h @@ -17,7 +17,7 @@ #pragma once -#include "sensor.h" +#include "drivers/sensor.h" typedef struct magDev_s { sensorInitFuncPtr init; // initialize function diff --git a/src/main/drivers/compass_ak8963.c b/src/main/drivers/compass/compass_ak8963.c similarity index 96% rename from src/main/drivers/compass_ak8963.c rename to src/main/drivers/compass/compass_ak8963.c index 3e98e4cc1c..09cf52e47a 100644 --- a/src/main/drivers/compass_ak8963.c +++ b/src/main/drivers/compass/compass_ak8963.c @@ -28,19 +28,19 @@ #include "common/maths.h" #include "common/utils.h" -#include "system.h" -#include "bus_i2c.h" -#include "bus_spi.h" +#include "drivers/system.h" +#include "drivers/bus_i2c.h" +#include "drivers/bus_spi.h" -#include "sensor.h" -#include "compass.h" +#include "drivers/sensor.h" +#include "drivers/compass/compass.h" -#include "accgyro.h" -#include "accgyro_mpu.h" -#include "accgyro_mpu6500.h" -#include "accgyro_spi_mpu6500.h" -#include "accgyro_spi_mpu9250.h" -#include "compass_ak8963.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_mpu6500.h" +#include "drivers/accgyro/accgyro_spi_mpu6500.h" +#include "drivers/accgyro/accgyro_spi_mpu9250.h" +#include "drivers/compass/compass_ak8963.h" // This sensor is available in MPU-9250. diff --git a/src/main/drivers/compass_ak8963.h b/src/main/drivers/compass/compass_ak8963.h similarity index 100% rename from src/main/drivers/compass_ak8963.h rename to src/main/drivers/compass/compass_ak8963.h diff --git a/src/main/drivers/compass_ak8975.c b/src/main/drivers/compass/compass_ak8975.c similarity index 97% rename from src/main/drivers/compass_ak8975.c rename to src/main/drivers/compass/compass_ak8975.c index d2856496f8..8c0b908e0c 100644 --- a/src/main/drivers/compass_ak8975.c +++ b/src/main/drivers/compass/compass_ak8975.c @@ -28,11 +28,11 @@ #include "common/maths.h" #include "common/utils.h" -#include "system.h" -#include "gpio.h" -#include "bus_i2c.h" +#include "drivers/system.h" +#include "drivers/gpio.h" +#include "drivers/bus_i2c.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "compass.h" #include "compass_ak8975.h" diff --git a/src/main/drivers/compass_ak8975.h b/src/main/drivers/compass/compass_ak8975.h similarity index 100% rename from src/main/drivers/compass_ak8975.h rename to src/main/drivers/compass/compass_ak8975.h diff --git a/src/main/drivers/compass_fake.c b/src/main/drivers/compass/compass_fake.c similarity index 100% rename from src/main/drivers/compass_fake.c rename to src/main/drivers/compass/compass_fake.c diff --git a/src/main/drivers/compass_fake.h b/src/main/drivers/compass/compass_fake.h similarity index 100% rename from src/main/drivers/compass_fake.h rename to src/main/drivers/compass/compass_fake.h diff --git a/src/main/drivers/compass_hmc5883l.c b/src/main/drivers/compass/compass_hmc5883l.c similarity index 98% rename from src/main/drivers/compass_hmc5883l.c rename to src/main/drivers/compass/compass_hmc5883l.c index 3f509f1d34..3fb86807bc 100644 --- a/src/main/drivers/compass_hmc5883l.c +++ b/src/main/drivers/compass/compass_hmc5883l.c @@ -29,14 +29,14 @@ #include "common/axis.h" #include "common/maths.h" -#include "system.h" -#include "nvic.h" -#include "io.h" -#include "exti.h" -#include "bus_i2c.h" -#include "light_led.h" +#include "drivers/system.h" +#include "drivers/nvic.h" +#include "drivers/io.h" +#include "drivers/exti.h" +#include "drivers/bus_i2c.h" +#include "drivers/light_led.h" -#include "sensor.h" +#include "drivers/sensor.h" #include "compass.h" #include "compass_hmc5883l.h" diff --git a/src/main/drivers/compass_hmc5883l.h b/src/main/drivers/compass/compass_hmc5883l.h similarity index 96% rename from src/main/drivers/compass_hmc5883l.h rename to src/main/drivers/compass/compass_hmc5883l.h index 0be30a9dc0..fc537cfb9d 100644 --- a/src/main/drivers/compass_hmc5883l.h +++ b/src/main/drivers/compass/compass_hmc5883l.h @@ -17,6 +17,6 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" bool hmc5883lDetect(magDev_t* mag, ioTag_t interruptTag); diff --git a/src/main/drivers/compass_spi_hmc5883l.c b/src/main/drivers/compass/compass_spi_hmc5883l.c similarity index 97% rename from src/main/drivers/compass_spi_hmc5883l.c rename to src/main/drivers/compass/compass_spi_hmc5883l.c index c1fef76bff..dcb650275c 100755 --- a/src/main/drivers/compass_spi_hmc5883l.c +++ b/src/main/drivers/compass/compass_spi_hmc5883l.c @@ -21,8 +21,8 @@ #include -#include "io.h" -#include "bus_spi.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" #include "compass.h" #include "compass_hmc5883l.h" diff --git a/src/main/drivers/compass_spi_hmc5883l.h b/src/main/drivers/compass/compass_spi_hmc5883l.h similarity index 100% rename from src/main/drivers/compass_spi_hmc5883l.h rename to src/main/drivers/compass/compass_spi_hmc5883l.h diff --git a/src/main/drivers/display_ug2864hsweg01.c b/src/main/drivers/display_ug2864hsweg01.c index d00eb9ecbd..173dafe0eb 100644 --- a/src/main/drivers/display_ug2864hsweg01.c +++ b/src/main/drivers/display_ug2864hsweg01.c @@ -20,8 +20,8 @@ #include "platform.h" -#include "bus_i2c.h" -#include "system.h" +#include "drivers/bus_i2c.h" +#include "drivers/system.h" #include "display_ug2864hsweg01.h" diff --git a/src/main/drivers/dma.c b/src/main/drivers/dma.c index a8d6cf9cb5..0d6d570254 100644 --- a/src/main/drivers/dma.c +++ b/src/main/drivers/dma.c @@ -21,7 +21,7 @@ #include -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" /* diff --git a/src/main/drivers/dma_stm32f4xx.c b/src/main/drivers/dma_stm32f4xx.c index b0c428564d..2ee7c2259f 100644 --- a/src/main/drivers/dma_stm32f4xx.c +++ b/src/main/drivers/dma_stm32f4xx.c @@ -21,7 +21,7 @@ #include -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" #include "resource.h" diff --git a/src/main/drivers/exti.c b/src/main/drivers/exti.c index db41a01c7a..d01db12c35 100644 --- a/src/main/drivers/exti.c +++ b/src/main/drivers/exti.c @@ -4,9 +4,9 @@ #include "platform.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "io_impl.h" -#include "exti.h" +#include "drivers/exti.h" #ifdef USE_EXTI diff --git a/src/main/drivers/exti.h b/src/main/drivers/exti.h index 202cd544c6..dcfadb739f 100644 --- a/src/main/drivers/exti.h +++ b/src/main/drivers/exti.h @@ -20,7 +20,7 @@ #include -#include "io_types.h" +#include "drivers/io_types.h" typedef struct extiCallbackRec_s extiCallbackRec_t; typedef void extiHandlerCallback(extiCallbackRec_t *self); diff --git a/src/main/drivers/flash_m25p16.c b/src/main/drivers/flash_m25p16.c index 139ead18cc..0563d43987 100644 --- a/src/main/drivers/flash_m25p16.c +++ b/src/main/drivers/flash_m25p16.c @@ -24,9 +24,9 @@ #include "flash.h" #include "flash_m25p16.h" -#include "io.h" -#include "bus_spi.h" -#include "system.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" +#include "drivers/system.h" #define M25P16_INSTRUCTION_RDID 0x9F #define M25P16_INSTRUCTION_READ_BYTES 0x03 diff --git a/src/main/drivers/gpio_stm32f10x.c b/src/main/drivers/gpio_stm32f10x.c index 03a6b323d8..c20cd7a150 100644 --- a/src/main/drivers/gpio_stm32f10x.c +++ b/src/main/drivers/gpio_stm32f10x.c @@ -20,7 +20,7 @@ #include "platform.h" -#include "gpio.h" +#include "drivers/gpio.h" void gpioInit(GPIO_TypeDef *gpio, gpio_config_t *config) { diff --git a/src/main/drivers/gpio_stm32f30x.c b/src/main/drivers/gpio_stm32f30x.c index ee54ab8a90..392ed88568 100644 --- a/src/main/drivers/gpio_stm32f30x.c +++ b/src/main/drivers/gpio_stm32f30x.c @@ -20,7 +20,7 @@ #include "platform.h" -#include "gpio.h" +#include "drivers/gpio.h" #define MODE_OFFSET 0 #define PUPD_OFFSET 2 diff --git a/src/main/drivers/gpio_stm32f4xx.c b/src/main/drivers/gpio_stm32f4xx.c index 7c5281191e..032cdd83ae 100644 --- a/src/main/drivers/gpio_stm32f4xx.c +++ b/src/main/drivers/gpio_stm32f4xx.c @@ -22,7 +22,7 @@ #include "build/build_config.h" -#include "gpio.h" +#include "drivers/gpio.h" #define MODE_OFFSET 0 #define PUPD_OFFSET 2 diff --git a/src/main/drivers/gpio_stm32f7xx.c b/src/main/drivers/gpio_stm32f7xx.c index e2ad183671..e29d070663 100644 --- a/src/main/drivers/gpio_stm32f7xx.c +++ b/src/main/drivers/gpio_stm32f7xx.c @@ -20,7 +20,7 @@ #include "platform.h" -#include "gpio.h" +#include "drivers/gpio.h" #define MODE_OFFSET 0 #define PUPD_OFFSET 5 diff --git a/src/main/drivers/gyro_sync.c b/src/main/drivers/gyro_sync.c index 82e0dc6586..a6a122651d 100644 --- a/src/main/drivers/gyro_sync.c +++ b/src/main/drivers/gyro_sync.c @@ -10,9 +10,9 @@ #include "platform.h" -#include "sensor.h" -#include "accgyro.h" -#include "gyro_sync.h" +#include "drivers/sensor.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/gyro_sync.h" bool gyroSyncCheckUpdate(gyroDev_t *gyro) diff --git a/src/main/drivers/gyro_sync.h b/src/main/drivers/gyro_sync.h index 7bd7d375e5..f488be5468 100644 --- a/src/main/drivers/gyro_sync.h +++ b/src/main/drivers/gyro_sync.h @@ -5,7 +5,7 @@ * Author: borisb */ -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" bool gyroSyncCheckUpdate(gyroDev_t *gyro); uint8_t gyroMPU6xxxGetDividerDrops(const gyroDev_t *gyro); diff --git a/src/main/drivers/inverter.c b/src/main/drivers/inverter.c index 27eaddfc3f..054db0c8b0 100644 --- a/src/main/drivers/inverter.c +++ b/src/main/drivers/inverter.c @@ -20,7 +20,7 @@ #include "platform.h" -#include "io.h" +#include "drivers/io.h" #include "io_impl.h" #include "inverter.h" diff --git a/src/main/drivers/io.c b/src/main/drivers/io.c index 1ae204b19e..0a32549b43 100644 --- a/src/main/drivers/io.c +++ b/src/main/drivers/io.c @@ -17,9 +17,9 @@ #include "platform.h" -#include "io.h" -#include "io_impl.h" -#include "rcc.h" +#include "drivers/io.h" +#include "drivers/io_impl.h" +#include "drivers/rcc.h" #include "common/utils.h" diff --git a/src/main/drivers/io.h b/src/main/drivers/io.h index 1bd308b123..55d863003c 100644 --- a/src/main/drivers/io.h +++ b/src/main/drivers/io.h @@ -24,7 +24,7 @@ #include "resource.h" -#include "io_types.h" +#include "drivers/io_types.h" // preprocessor is used to convert pinid to requested C data value // compile-time error is generated if requested pin is not available (not set in TARGET_IO_PORTx) diff --git a/src/main/drivers/io_impl.h b/src/main/drivers/io_impl.h index 65810c62ea..30f611025c 100644 --- a/src/main/drivers/io_impl.h +++ b/src/main/drivers/io_impl.h @@ -20,7 +20,7 @@ // TODO - GPIO_TypeDef include #include "platform.h" -#include "io.h" +#include "drivers/io.h" typedef struct ioDef_s { ioTag_t tag; diff --git a/src/main/drivers/io_types.h b/src/main/drivers/io_types.h index ebf2be7ce8..36f1c42855 100644 --- a/src/main/drivers/io_types.h +++ b/src/main/drivers/io_types.h @@ -25,7 +25,7 @@ typedef uint8_t ioTag_t; // packet tag to specify IO pin typedef void* IO_t; // type specifying IO pin. Currently ioRec_t pointer, but this may change // NONE initializer for ioTag_t variables -#define IO_TAG_NONE IO_TAG(NONE) +#define IO_TAG_NONE 0 // NONE initializer for IO_t variable #define IO_NONE ((IO_t)0) diff --git a/src/main/drivers/light_led.c b/src/main/drivers/light_led.c index 8f3fcd9d15..858ee1ff08 100644 --- a/src/main/drivers/light_led.c +++ b/src/main/drivers/light_led.c @@ -17,7 +17,7 @@ #include "platform.h" -#include "io.h" +#include "drivers/io.h" #include "io_impl.h" #include "light_led.h" diff --git a/src/main/drivers/light_ws2811strip.c b/src/main/drivers/light_ws2811strip.c index 593a563e91..cc9c6626cf 100644 --- a/src/main/drivers/light_ws2811strip.c +++ b/src/main/drivers/light_ws2811strip.c @@ -37,7 +37,7 @@ #include "common/color.h" #include "common/colorconversion.h" #include "dma.h" -#include "io.h" +#include "drivers/io.h" #include "light_ws2811strip.h" #if defined(STM32F1) || defined(STM32F3) diff --git a/src/main/drivers/light_ws2811strip.h b/src/main/drivers/light_ws2811strip.h index 370021e3b3..db51d00edf 100644 --- a/src/main/drivers/light_ws2811strip.h +++ b/src/main/drivers/light_ws2811strip.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" #define WS2811_LED_STRIP_LENGTH 32 #define WS2811_BITS_PER_LED 24 diff --git a/src/main/drivers/light_ws2811strip_hal.c b/src/main/drivers/light_ws2811strip_hal.c index 93698f649f..1a501abbed 100644 --- a/src/main/drivers/light_ws2811strip_hal.c +++ b/src/main/drivers/light_ws2811strip_hal.c @@ -24,10 +24,10 @@ #include "common/color.h" #include "light_ws2811strip.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" -#include "io.h" -#include "system.h" +#include "drivers/io.h" +#include "drivers/system.h" #include "rcc.h" #include "timer.h" diff --git a/src/main/drivers/light_ws2811strip_stdperiph.c b/src/main/drivers/light_ws2811strip_stdperiph.c index bb7d149267..b94071bb5b 100644 --- a/src/main/drivers/light_ws2811strip_stdperiph.c +++ b/src/main/drivers/light_ws2811strip_stdperiph.c @@ -22,13 +22,13 @@ #ifdef LED_STRIP -#include "io.h" -#include "nvic.h" +#include "drivers/io.h" +#include "drivers/nvic.h" #include "common/color.h" #include "light_ws2811strip.h" #include "dma.h" -#include "system.h" +#include "drivers/system.h" #include "rcc.h" #include "timer.h" diff --git a/src/main/drivers/pwm_esc_detect.c b/src/main/drivers/pwm_esc_detect.c index 012f912688..26cb3a61cf 100644 --- a/src/main/drivers/pwm_esc_detect.c +++ b/src/main/drivers/pwm_esc_detect.c @@ -24,8 +24,8 @@ #include "build/build_config.h" -#include "system.h" -#include "io.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "pwm_esc_detect.h" #include "timer.h" diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c index 9a27ba30c4..4a19e7e539 100644 --- a/src/main/drivers/pwm_output.c +++ b/src/main/drivers/pwm_output.c @@ -21,9 +21,9 @@ #include #include "platform.h" -#include "system.h" +#include "drivers/system.h" -#include "io.h" +#include "drivers/io.h" #include "pwm_output.h" #include "timer.h" #include "drivers/pwm_output.h" diff --git a/src/main/drivers/pwm_output.h b/src/main/drivers/pwm_output.h index 16ae294d32..f4249f4adf 100644 --- a/src/main/drivers/pwm_output.h +++ b/src/main/drivers/pwm_output.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" #include "timer.h" #define MAX_SUPPORTED_MOTORS 12 diff --git a/src/main/drivers/pwm_output_dshot.c b/src/main/drivers/pwm_output_dshot.c index 48b0a51eae..4b53f7dd11 100644 --- a/src/main/drivers/pwm_output_dshot.c +++ b/src/main/drivers/pwm_output_dshot.c @@ -22,7 +22,7 @@ #ifdef USE_DSHOT -#include "io.h" +#include "drivers/io.h" #include "timer.h" #if defined(STM32F4) #include "timer_stm32f4xx.h" @@ -30,9 +30,9 @@ #include "timer_stm32f30x.h" #endif #include "pwm_output.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" -#include "system.h" +#include "drivers/system.h" #include "rcc.h" static uint8_t dmaMotorTimerCount = 0; diff --git a/src/main/drivers/pwm_output_stm32f7xx.c b/src/main/drivers/pwm_output_stm32f7xx.c index dc34afbf95..c68da856ae 100644 --- a/src/main/drivers/pwm_output_stm32f7xx.c +++ b/src/main/drivers/pwm_output_stm32f7xx.c @@ -22,12 +22,12 @@ #ifdef USE_DSHOT -#include "io.h" +#include "drivers/io.h" #include "timer.h" #include "pwm_output.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" -#include "system.h" +#include "drivers/system.h" #include "rcc.h" static uint8_t dmaMotorTimerCount = 0; diff --git a/src/main/drivers/rx_nrf24l01.c b/src/main/drivers/rx_nrf24l01.c index 00c0523d0d..9aa941a4f5 100644 --- a/src/main/drivers/rx_nrf24l01.c +++ b/src/main/drivers/rx_nrf24l01.c @@ -28,12 +28,12 @@ #include "build/build_config.h" -#include "bus_spi.h" -#include "io.h" +#include "drivers/bus_spi.h" +#include "drivers/io.h" #include "io_impl.h" #include "rx_spi.h" #include "rx_nrf24l01.h" -#include "system.h" +#include "drivers/system.h" #define NRF24_CE_HI() {IOHi(DEFIO_IO(RX_CE_PIN));} #define NRF24_CE_LO() {IOLo(DEFIO_IO(RX_CE_PIN));} diff --git a/src/main/drivers/rx_pwm.c b/src/main/drivers/rx_pwm.c index 88df074f18..f7e103666c 100644 --- a/src/main/drivers/rx_pwm.c +++ b/src/main/drivers/rx_pwm.c @@ -27,10 +27,10 @@ #include "common/utils.h" -#include "system.h" +#include "drivers/system.h" -#include "nvic.h" -#include "io.h" +#include "drivers/nvic.h" +#include "drivers/io.h" #include "timer.h" #include "pwm_output.h" diff --git a/src/main/drivers/rx_spi.c b/src/main/drivers/rx_spi.c index d37a91f284..21608b8e9c 100644 --- a/src/main/drivers/rx_spi.c +++ b/src/main/drivers/rx_spi.c @@ -28,14 +28,14 @@ #include "build/build_config.h" -#include "bus_spi.h" +#include "drivers/bus_spi.h" #include "bus_spi_soft.h" -#include "gpio.h" -#include "io.h" +#include "drivers/gpio.h" +#include "drivers/io.h" #include "io_impl.h" #include "rcc.h" #include "rx_spi.h" -#include "system.h" +#include "drivers/system.h" #define DISABLE_RX() {IOHi(DEFIO_IO(RX_NSS_PIN));} #define ENABLE_RX() {IOLo(DEFIO_IO(RX_NSS_PIN));} diff --git a/src/main/drivers/sdcard.c b/src/main/drivers/sdcard.c index 02441b2c66..18e486b969 100644 --- a/src/main/drivers/sdcard.c +++ b/src/main/drivers/sdcard.c @@ -22,12 +22,12 @@ #ifdef USE_SDCARD -#include "nvic.h" -#include "io.h" +#include "drivers/nvic.h" +#include "drivers/io.h" #include "dma.h" -#include "bus_spi.h" -#include "system.h" +#include "drivers/bus_spi.h" +#include "drivers/system.h" #include "sdcard.h" #include "sdcard_standard.h" diff --git a/src/main/drivers/sensor.h b/src/main/drivers/sensor.h index 288ac3bd93..ecf59fd1d3 100644 --- a/src/main/drivers/sensor.h +++ b/src/main/drivers/sensor.h @@ -20,7 +20,7 @@ #include #include -#include "io_types.h" +#include "drivers/io_types.h" typedef enum { ALIGN_DEFAULT = 0, // driver-provided alignment diff --git a/src/main/drivers/serial_escserial.c b/src/main/drivers/serial_escserial.c index 6736b6b0fe..59e14ed0f0 100644 --- a/src/main/drivers/serial_escserial.c +++ b/src/main/drivers/serial_escserial.c @@ -34,9 +34,9 @@ typedef enum { #include "common/utils.h" -#include "nvic.h" -#include "system.h" -#include "io.h" +#include "drivers/nvic.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "timer.h" #include "serial.h" diff --git a/src/main/drivers/serial_softserial.c b/src/main/drivers/serial_softserial.c index cec09aec25..69efe493eb 100644 --- a/src/main/drivers/serial_softserial.c +++ b/src/main/drivers/serial_softserial.c @@ -34,9 +34,9 @@ #include "common/utils.h" -#include "nvic.h" -#include "system.h" -#include "io.h" +#include "drivers/nvic.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "timer.h" #include "serial.h" diff --git a/src/main/drivers/serial_uart.c b/src/main/drivers/serial_uart.c index 9dd53046db..baf690e93a 100644 --- a/src/main/drivers/serial_uart.c +++ b/src/main/drivers/serial_uart.c @@ -28,7 +28,7 @@ #include "build/build_config.h" #include "common/utils.h" -#include "gpio.h" +#include "drivers/gpio.h" #include "inverter.h" #include "serial.h" diff --git a/src/main/drivers/serial_uart_hal.c b/src/main/drivers/serial_uart_hal.c index 9ea30e57de..63232ddead 100644 --- a/src/main/drivers/serial_uart_hal.c +++ b/src/main/drivers/serial_uart_hal.c @@ -29,8 +29,8 @@ #include "build/build_config.h" #include "common/utils.h" -#include "io.h" -#include "nvic.h" +#include "drivers/io.h" +#include "drivers/nvic.h" #include "inverter.h" #include "dma.h" diff --git a/src/main/drivers/serial_uart_stm32f10x.c b/src/main/drivers/serial_uart_stm32f10x.c index 1407b9ea0f..bfadfb0b52 100644 --- a/src/main/drivers/serial_uart_stm32f10x.c +++ b/src/main/drivers/serial_uart_stm32f10x.c @@ -27,9 +27,9 @@ #include -#include "system.h" -#include "io.h" -#include "nvic.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/nvic.h" #include "dma.h" #include "rcc.h" diff --git a/src/main/drivers/serial_uart_stm32f30x.c b/src/main/drivers/serial_uart_stm32f30x.c index d99f4d15c0..e04751608e 100644 --- a/src/main/drivers/serial_uart_stm32f30x.c +++ b/src/main/drivers/serial_uart_stm32f30x.c @@ -28,9 +28,9 @@ #include -#include "system.h" -#include "io.h" -#include "nvic.h" +#include "drivers/system.h" +#include "drivers/io.h" +#include "drivers/nvic.h" #include "dma.h" #include "rcc.h" diff --git a/src/main/drivers/serial_uart_stm32f4xx.c b/src/main/drivers/serial_uart_stm32f4xx.c index 4968b9fcac..2b9e2d86d4 100644 --- a/src/main/drivers/serial_uart_stm32f4xx.c +++ b/src/main/drivers/serial_uart_stm32f4xx.c @@ -20,10 +20,10 @@ #include "platform.h" -#include "system.h" -#include "io.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "rcc.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" #include "serial.h" diff --git a/src/main/drivers/serial_uart_stm32f7xx.c b/src/main/drivers/serial_uart_stm32f7xx.c index 2bd0f1b65a..6a400a6a50 100644 --- a/src/main/drivers/serial_uart_stm32f7xx.c +++ b/src/main/drivers/serial_uart_stm32f7xx.c @@ -20,10 +20,10 @@ #include "platform.h" -#include "system.h" -#include "io.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "rcc.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "dma.h" #include "serial.h" diff --git a/src/main/drivers/serial_usb_vcp.c b/src/main/drivers/serial_usb_vcp.c index 97fdfe03c4..04395591bd 100644 --- a/src/main/drivers/serial_usb_vcp.c +++ b/src/main/drivers/serial_usb_vcp.c @@ -23,7 +23,7 @@ #include "build/build_config.h" #include "common/utils.h" -#include "io.h" +#include "drivers/io.h" #if defined(STM32F4) #include "usb_core.h" @@ -39,7 +39,7 @@ USBD_HandleTypeDef USBD_Device; #include "hw_config.h" #endif -#include "system.h" +#include "drivers/system.h" #include "serial.h" #include "serial_usb_vcp.h" diff --git a/src/main/drivers/sonar_hcsr04.c b/src/main/drivers/sonar_hcsr04.c index e3d851f8de..f485620f70 100644 --- a/src/main/drivers/sonar_hcsr04.c +++ b/src/main/drivers/sonar_hcsr04.c @@ -22,10 +22,10 @@ #include "build/build_config.h" -#include "system.h" -#include "nvic.h" -#include "io.h" -#include "exti.h" +#include "drivers/system.h" +#include "drivers/nvic.h" +#include "drivers/io.h" +#include "drivers/exti.h" #include "sonar_hcsr04.h" /* HC-SR04 consists of ultrasonic transmitter, receiver, and control circuits. diff --git a/src/main/drivers/sonar_hcsr04.h b/src/main/drivers/sonar_hcsr04.h index 820810186b..c04791e09d 100644 --- a/src/main/drivers/sonar_hcsr04.h +++ b/src/main/drivers/sonar_hcsr04.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" typedef struct sonarConfig_s { ioTag_t triggerTag; diff --git a/src/main/drivers/sound_beeper.c b/src/main/drivers/sound_beeper.c index 7c446e9b79..543dbffebd 100644 --- a/src/main/drivers/sound_beeper.c +++ b/src/main/drivers/sound_beeper.c @@ -20,8 +20,8 @@ #include "platform.h" -#include "system.h" -#include "io.h" +#include "drivers/system.h" +#include "drivers/io.h" #include "sound_beeper.h" #include "pwm_output.h" diff --git a/src/main/drivers/sound_beeper.h b/src/main/drivers/sound_beeper.h index 274b2ac2d8..ef85ec173e 100644 --- a/src/main/drivers/sound_beeper.h +++ b/src/main/drivers/sound_beeper.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" #ifdef BEEPER #define BEEP_TOGGLE systemBeepToggle() diff --git a/src/main/drivers/system.c b/src/main/drivers/system.c index 1d85160335..eee2069d21 100644 --- a/src/main/drivers/system.c +++ b/src/main/drivers/system.c @@ -20,13 +20,13 @@ #include "platform.h" -#include "gpio.h" +#include "drivers/gpio.h" #include "light_led.h" #include "sound_beeper.h" -#include "nvic.h" +#include "drivers/nvic.h" #include "build/atomic.h" -#include "system.h" +#include "drivers/system.h" // cycles per microsecond static uint32_t usTicks = 0; diff --git a/src/main/drivers/system_stm32f10x.c b/src/main/drivers/system_stm32f10x.c index d7f0d136e5..b6f2d423e0 100644 --- a/src/main/drivers/system_stm32f10x.c +++ b/src/main/drivers/system_stm32f10x.c @@ -20,9 +20,9 @@ #include "platform.h" -#include "gpio.h" -#include "nvic.h" -#include "system.h" +#include "drivers/gpio.h" +#include "drivers/nvic.h" +#include "drivers/system.h" #define AIRCR_VECTKEY_MASK ((uint32_t)0x05FA0000) diff --git a/src/main/drivers/system_stm32f30x.c b/src/main/drivers/system_stm32f30x.c index b62d8bb3c7..a00abdfba0 100644 --- a/src/main/drivers/system_stm32f30x.c +++ b/src/main/drivers/system_stm32f30x.c @@ -20,9 +20,9 @@ #include "platform.h" -#include "gpio.h" -#include "nvic.h" -#include "system.h" +#include "drivers/gpio.h" +#include "drivers/nvic.h" +#include "drivers/system.h" #define AIRCR_VECTKEY_MASK ((uint32_t)0x05FA0000) void SetSysClock(); diff --git a/src/main/drivers/system_stm32f4xx.c b/src/main/drivers/system_stm32f4xx.c index 0216d45427..de32333124 100644 --- a/src/main/drivers/system_stm32f4xx.c +++ b/src/main/drivers/system_stm32f4xx.c @@ -20,10 +20,10 @@ #include "platform.h" -#include "accgyro_mpu.h" -#include "exti.h" -#include "nvic.h" -#include "system.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/exti.h" +#include "drivers/nvic.h" +#include "drivers/system.h" #define AIRCR_VECTKEY_MASK ((uint32_t)0x05FA0000) diff --git a/src/main/drivers/system_stm32f7xx.c b/src/main/drivers/system_stm32f7xx.c index 0099833674..db4f9085ea 100644 --- a/src/main/drivers/system_stm32f7xx.c +++ b/src/main/drivers/system_stm32f7xx.c @@ -22,10 +22,10 @@ #include "platform.h" -#include "accgyro_mpu.h" -#include "exti.h" -#include "nvic.h" -#include "system.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/exti.h" +#include "drivers/nvic.h" +#include "drivers/system.h" #define AIRCR_VECTKEY_MASK ((uint32_t)0x05FA0000) diff --git a/src/main/drivers/timer.c b/src/main/drivers/timer.c index f77e54a057..9d03e215eb 100755 --- a/src/main/drivers/timer.c +++ b/src/main/drivers/timer.c @@ -26,11 +26,11 @@ #include "common/utils.h" -#include "nvic.h" +#include "drivers/nvic.h" -#include "io.h" +#include "drivers/io.h" #include "rcc.h" -#include "system.h" +#include "drivers/system.h" #include "timer.h" #include "timer_impl.h" diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h index 67bfc60496..2f5db50ab7 100644 --- a/src/main/drivers/timer.h +++ b/src/main/drivers/timer.h @@ -20,7 +20,7 @@ #include #include -#include "io_types.h" +#include "drivers/io_types.h" #include "rcc_types.h" typedef uint16_t captureCompare_t; // 16 bit on both 103 and 303, just register access must be 32bit sometimes (use timCCR_t) diff --git a/src/main/drivers/timer_hal.c b/src/main/drivers/timer_hal.c index 34f742c4c2..6ac788e4e6 100644 --- a/src/main/drivers/timer_hal.c +++ b/src/main/drivers/timer_hal.c @@ -26,11 +26,11 @@ #include "common/utils.h" -#include "nvic.h" +#include "drivers/nvic.h" -#include "io.h" +#include "drivers/io.h" #include "rcc.h" -#include "system.h" +#include "drivers/system.h" #include "timer.h" #include "timer_impl.h" diff --git a/src/main/drivers/transponder_ir.c b/src/main/drivers/transponder_ir.c index efe6a1b022..1b4e37a721 100644 --- a/src/main/drivers/transponder_ir.c +++ b/src/main/drivers/transponder_ir.c @@ -24,8 +24,8 @@ #ifdef TRANSPONDER #include "dma.h" -#include "nvic.h" -#include "io.h" +#include "drivers/nvic.h" +#include "drivers/io.h" #include "rcc.h" #include "timer.h" diff --git a/src/main/drivers/transponder_ir.h b/src/main/drivers/transponder_ir.h index fb0c276427..e6303f9afd 100644 --- a/src/main/drivers/transponder_ir.h +++ b/src/main/drivers/transponder_ir.h @@ -17,7 +17,7 @@ #pragma once -#include "io_types.h" +#include "drivers/io_types.h" bool transponderIrInit(); void transponderIrDisable(void); diff --git a/src/main/drivers/usb_io.c b/src/main/drivers/usb_io.c index 34113e7efe..eb41809ef4 100644 --- a/src/main/drivers/usb_io.c +++ b/src/main/drivers/usb_io.c @@ -22,8 +22,8 @@ #ifdef USE_VCP -#include "io.h" -#include "system.h" +#include "drivers/io.h" +#include "drivers/system.h" #include "usb_io.h" #include "sdcard.h" diff --git a/src/main/drivers/vtx_rtc6705.c b/src/main/drivers/vtx_rtc6705.c index 59aa7c2f7d..de2879e198 100644 --- a/src/main/drivers/vtx_rtc6705.c +++ b/src/main/drivers/vtx_rtc6705.c @@ -32,9 +32,9 @@ #include "common/maths.h" #include "vtx_rtc6705.h" -#include "io.h" -#include "bus_spi.h" -#include "system.h" +#include "drivers/io.h" +#include "drivers/bus_spi.h" +#include "drivers/system.h" #define RTC6705_SET_HEAD 0x3210 //fosc=8mhz r=400 #define RTC6705_SET_A1 0x8F3031 //5865 diff --git a/src/main/drivers/vtx_soft_spi_rtc6705.c b/src/main/drivers/vtx_soft_spi_rtc6705.c index cf480fb072..2d3e084dcd 100644 --- a/src/main/drivers/vtx_soft_spi_rtc6705.c +++ b/src/main/drivers/vtx_soft_spi_rtc6705.c @@ -22,9 +22,9 @@ #ifdef USE_RTC6705 -#include "bus_spi.h" -#include "io.h" -#include "system.h" +#include "drivers/bus_spi.h" +#include "drivers/io.h" +#include "drivers/system.h" #include "light_led.h" #include "vtx_soft_spi_rtc6705.h" diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index 6c3d9f816d..2e76a47d55 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -53,10 +53,10 @@ extern uint8_t __config_end; #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "drivers/buf_writer.h" #include "drivers/bus_i2c.h" -#include "drivers/compass.h" +#include "drivers/compass/compass.h" #include "drivers/display.h" #include "drivers/dma.h" #include "drivers/flash.h" @@ -164,14 +164,18 @@ static const char * const lookupTableAccHardware[] = { "AUTO", "NONE", "ADXL345", "MPU6050", "MMA8452", "BMA280", "LSM303DLHC", "MPU6000", "MPU6500", "MPU9250", "ICM20601", "ICM20602", "ICM20608", "ICM20689", "BMI160", "FAKE" }; +#if defined(USE_SENSOR_NAMES) || defined(BARO) // sync with baroSensor_e static const char * const lookupTableBaroHardware[] = { "AUTO", "NONE", "BMP085", "MS5611", "BMP280" }; +#endif +#if defined(USE_SENSOR_NAMES) || defined(MAG) // sync with magSensor_e static const char * const lookupTableMagHardware[] = { "AUTO", "NONE", "HMC5883", "AK8975", "AK8963" }; +#endif #if defined(USE_SENSOR_NAMES) // sync this with sensors_e diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 9265bd132e..c1240b75f6 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -39,8 +39,8 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/accgyro.h" -#include "drivers/compass.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/compass/compass.h" #include "drivers/io.h" #include "drivers/light_led.h" #include "drivers/light_ws2811strip.h" diff --git a/src/main/fc/fc_init.c b/src/main/fc/fc_init.c index 09dde1fa13..6433637867 100644 --- a/src/main/fc/fc_init.c +++ b/src/main/fc/fc_init.c @@ -47,8 +47,8 @@ #include "drivers/serial.h" #include "drivers/serial_softserial.h" #include "drivers/serial_uart.h" -#include "drivers/accgyro.h" -#include "drivers/compass.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/compass/compass.h" #include "drivers/pwm_esc_detect.h" #include "drivers/rx_pwm.h" #include "drivers/pwm_output.h" diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index a95c133ff4..c2663fa463 100755 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -38,9 +38,9 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "drivers/bus_i2c.h" -#include "drivers/compass.h" +#include "drivers/compass/compass.h" #include "drivers/flash.h" #include "drivers/io.h" #include "drivers/max7456.h" diff --git a/src/main/fc/fc_tasks.c b/src/main/fc/fc_tasks.c index 2002d3899b..341af8e0e1 100644 --- a/src/main/fc/fc_tasks.c +++ b/src/main/fc/fc_tasks.c @@ -33,8 +33,8 @@ #include "config/parameter_group_ids.h" #include "drivers/sensor.h" -#include "drivers/accgyro.h" -#include "drivers/compass.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/compass/compass.h" #include "drivers/serial.h" #include "drivers/stack_check.h" #include "drivers/vtx_common.h" diff --git a/src/main/sensors/acceleration.c b/src/main/sensors/acceleration.c index 9539ae8c50..e57a6d8ea0 100644 --- a/src/main/sensors/acceleration.c +++ b/src/main/sensors/acceleration.c @@ -31,23 +31,23 @@ #include "config/parameter_group_ids.h" #include "config/config_reset.h" -#include "drivers/accgyro.h" -#include "drivers/accgyro_adxl345.h" -#include "drivers/accgyro_bma280.h" -#include "drivers/accgyro_fake.h" -#include "drivers/accgyro_l3g4200d.h" -#include "drivers/accgyro_l3gd20.h" -#include "drivers/accgyro_lsm303dlhc.h" -#include "drivers/accgyro_mma845x.h" -#include "drivers/accgyro_mpu.h" -#include "drivers/accgyro_mpu3050.h" -#include "drivers/accgyro_mpu6050.h" -#include "drivers/accgyro_mpu6500.h" -#include "drivers/accgyro_spi_bmi160.h" -#include "drivers/accgyro_spi_icm20689.h" -#include "drivers/accgyro_spi_mpu6000.h" -#include "drivers/accgyro_spi_mpu6500.h" -#include "drivers/accgyro_spi_mpu9250.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_adxl345.h" +#include "drivers/accgyro/accgyro_bma280.h" +#include "drivers/accgyro/accgyro_fake.h" +#include "drivers/accgyro/accgyro_l3g4200d.h" +#include "drivers/accgyro/accgyro_l3gd20.h" +#include "drivers/accgyro/accgyro_lsm303dlhc.h" +#include "drivers/accgyro/accgyro_mma845x.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_mpu3050.h" +#include "drivers/accgyro/accgyro_mpu6050.h" +#include "drivers/accgyro/accgyro_mpu6500.h" +#include "drivers/accgyro/accgyro_spi_bmi160.h" +#include "drivers/accgyro/accgyro_spi_icm20689.h" +#include "drivers/accgyro/accgyro_spi_mpu6000.h" +#include "drivers/accgyro/accgyro_spi_mpu6500.h" +#include "drivers/accgyro/accgyro_spi_mpu9250.h" #include "drivers/bus_spi.h" #include "drivers/system.h" diff --git a/src/main/sensors/acceleration.h b/src/main/sensors/acceleration.h index 2560dfd96c..38f6c5fa70 100644 --- a/src/main/sensors/acceleration.h +++ b/src/main/sensors/acceleration.h @@ -18,7 +18,7 @@ #pragma once #include "config/parameter_group.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "sensors/sensors.h" // Type of accelerometer used/detected diff --git a/src/main/sensors/barometer.c b/src/main/sensors/barometer.c index d282af5dad..767f7db937 100644 --- a/src/main/sensors/barometer.c +++ b/src/main/sensors/barometer.c @@ -26,11 +26,11 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/barometer.h" -#include "drivers/barometer_bmp085.h" -#include "drivers/barometer_bmp280.h" -#include "drivers/barometer_fake.h" -#include "drivers/barometer_ms5611.h" +#include "drivers/barometer/barometer.h" +#include "drivers/barometer/barometer_bmp085.h" +#include "drivers/barometer/barometer_bmp280.h" +#include "drivers/barometer/barometer_fake.h" +#include "drivers/barometer/barometer_ms5611.h" #include "drivers/system.h" #include "fc/runtime_config.h" diff --git a/src/main/sensors/barometer.h b/src/main/sensors/barometer.h index fbc43e75d2..60d7b6f92a 100644 --- a/src/main/sensors/barometer.h +++ b/src/main/sensors/barometer.h @@ -18,7 +18,7 @@ #pragma once #include "config/parameter_group.h" -#include "drivers/barometer.h" +#include "drivers/barometer/barometer.h" typedef enum { BARO_DEFAULT = 0, diff --git a/src/main/sensors/compass.c b/src/main/sensors/compass.c index 07c5d1a60d..04f0fa89bd 100644 --- a/src/main/sensors/compass.c +++ b/src/main/sensors/compass.c @@ -25,11 +25,11 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/compass.h" -#include "drivers/compass_ak8975.h" -#include "drivers/compass_ak8963.h" -#include "drivers/compass_fake.h" -#include "drivers/compass_hmc5883l.h" +#include "drivers/compass/compass.h" +#include "drivers/compass/compass_ak8975.h" +#include "drivers/compass/compass_ak8963.h" +#include "drivers/compass/compass_fake.h" +#include "drivers/compass/compass_hmc5883l.h" #include "drivers/io.h" #include "drivers/light_led.h" diff --git a/src/main/sensors/gyro.c b/src/main/sensors/gyro.c index 78ddf33535..9dc785d9a7 100644 --- a/src/main/sensors/gyro.c +++ b/src/main/sensors/gyro.c @@ -31,23 +31,23 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/accgyro.h" -#include "drivers/accgyro_adxl345.h" -#include "drivers/accgyro_bma280.h" -#include "drivers/accgyro_fake.h" -#include "drivers/accgyro_l3g4200d.h" -#include "drivers/accgyro_l3gd20.h" -#include "drivers/accgyro_lsm303dlhc.h" -#include "drivers/accgyro_mma845x.h" -#include "drivers/accgyro_mpu.h" -#include "drivers/accgyro_mpu3050.h" -#include "drivers/accgyro_mpu6050.h" -#include "drivers/accgyro_mpu6500.h" -#include "drivers/accgyro_spi_bmi160.h" -#include "drivers/accgyro_spi_icm20689.h" -#include "drivers/accgyro_spi_mpu6000.h" -#include "drivers/accgyro_spi_mpu6500.h" -#include "drivers/accgyro_spi_mpu9250.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_adxl345.h" +#include "drivers/accgyro/accgyro_bma280.h" +#include "drivers/accgyro/accgyro_fake.h" +#include "drivers/accgyro/accgyro_l3g4200d.h" +#include "drivers/accgyro/accgyro_l3gd20.h" +#include "drivers/accgyro/accgyro_lsm303dlhc.h" +#include "drivers/accgyro/accgyro_mma845x.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_mpu3050.h" +#include "drivers/accgyro/accgyro_mpu6050.h" +#include "drivers/accgyro/accgyro_mpu6500.h" +#include "drivers/accgyro/accgyro_spi_bmi160.h" +#include "drivers/accgyro/accgyro_spi_icm20689.h" +#include "drivers/accgyro/accgyro_spi_mpu6000.h" +#include "drivers/accgyro/accgyro_spi_mpu6500.h" +#include "drivers/accgyro/accgyro_spi_mpu9250.h" #include "drivers/bus_spi.h" #include "drivers/gyro_sync.h" #include "drivers/io.h" diff --git a/src/main/sensors/gyroanalyse.c b/src/main/sensors/gyroanalyse.c index 13258cf296..5109c75213 100644 --- a/src/main/sensors/gyroanalyse.c +++ b/src/main/sensors/gyroanalyse.c @@ -12,7 +12,7 @@ #include "common/time.h" #include "common/utils.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "sensors/gyro.h" #include "sensors/gyroanalyse.h" diff --git a/src/main/target/AIR32/target.mk b/src/main/target/AIR32/target.mk index 8246f9de4e..dae15464f1 100644 --- a/src/main/target/AIR32/target.mk +++ b/src/main/target/AIR32/target.mk @@ -2,10 +2,10 @@ F3_TARGETS += $(TARGET) FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c \ drivers/inverter.c diff --git a/src/main/target/AIRHEROF3/target.mk b/src/main/target/AIRHEROF3/target.mk index 29d50f9903..eb885e711f 100755 --- a/src/main/target/AIRHEROF3/target.mk +++ b/src/main/target/AIRHEROF3/target.mk @@ -2,8 +2,8 @@ F3_TARGETS += $(TARGET) HSE_VALUE = 12000000 TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_spi_bmp280.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_spi_bmp280.c diff --git a/src/main/target/ALIENFLIGHTF1/target.mk b/src/main/target/ALIENFLIGHTF1/target.mk index cc553693d2..b3b267fc71 100644 --- a/src/main/target/ALIENFLIGHTF1/target.mk +++ b/src/main/target/ALIENFLIGHTF1/target.mk @@ -1,5 +1,5 @@ F1_TARGETS += $(TARGET) TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk index e5c79a59a3..ccf8916a8e 100644 --- a/src/main/target/ALIENFLIGHTF3/target.mk +++ b/src/main/target/ALIENFLIGHTF3/target.mk @@ -2,9 +2,9 @@ F3_TARGETS += $(TARGET) FEATURES = VCP TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/compass_ak8963.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/compass/compass_ak8963.c diff --git a/src/main/target/ALIENFLIGHTF4/target.mk b/src/main/target/ALIENFLIGHTF4/target.mk index 4b9a0ce059..cdd87e9dcc 100644 --- a/src/main/target/ALIENFLIGHTF4/target.mk +++ b/src/main/target/ALIENFLIGHTF4/target.mk @@ -2,10 +2,10 @@ F405_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8963.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/ALIENFLIGHTNGF7/target.mk b/src/main/target/ALIENFLIGHTNGF7/target.mk index 175dd29bc7..2f9f35e503 100644 --- a/src/main/target/ALIENFLIGHTNGF7/target.mk +++ b/src/main/target/ALIENFLIGHTNGF7/target.mk @@ -2,14 +2,14 @@ F7X2RE_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_spi_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_spi_ms5611.c \ - drivers/compass_ak8963.c \ - drivers/compass_hmc5883l.c \ - drivers/compass_spi_hmc5883l.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_spi_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_spi_ms5611.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_spi_hmc5883l.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c diff --git a/src/main/target/ANYFCF7/target.mk b/src/main/target/ANYFCF7/target.mk index 158958769f..bdc188d400 100644 --- a/src/main/target/ANYFCF7/target.mk +++ b/src/main/target/ANYFCF7/target.mk @@ -2,8 +2,8 @@ F7X5XG_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c diff --git a/src/main/target/BEEROTORF4/target.mk b/src/main/target/BEEROTORF4/target.mk index 42c3e61566..95552ddab1 100644 --- a/src/main/target/BEEROTORF4/target.mk +++ b/src/main/target/BEEROTORF4/target.mk @@ -2,9 +2,9 @@ F405_TARGETS += $(TARGET) FEATURES += VCP SDCARD HIGHEND TARGET_SRC = \ - drivers/accgyro_spi_icm20689.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ + drivers/accgyro/accgyro_spi_icm20689.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ drivers/max7456.c \ drivers/transponder_ir.c \ io/transponder_ir.c diff --git a/src/main/target/BETAFLIGHTF3/target.mk b/src/main/target/BETAFLIGHTF3/target.mk index 53222223b6..297f9be3f1 100755 --- a/src/main/target/BETAFLIGHTF3/target.mk +++ b/src/main/target/BETAFLIGHTF3/target.mk @@ -4,10 +4,10 @@ FEATURES = VCP SDCARD TARGET_FLAGS = -DSPRACINGF3 TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/display_ug2864hsweg01.h \ drivers/flash_m25p16.c \ drivers/max7456.c \ diff --git a/src/main/target/BLUEJAYF4/target.mk b/src/main/target/BLUEJAYF4/target.mk index f4802c88b9..f08ab8ba12 100644 --- a/src/main/target/BLUEJAYF4/target.mk +++ b/src/main/target/BLUEJAYF4/target.mk @@ -2,7 +2,7 @@ F405_TARGETS += $(TARGET) FEATURES += SDCARD VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c \ - drivers/barometer_ms5611.c + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/barometer/barometer_ms5611.c diff --git a/src/main/target/CC3D/target.mk b/src/main/target/CC3D/target.mk index a9cdd0ad7c..73a934e79a 100644 --- a/src/main/target/CC3D/target.mk +++ b/src/main/target/CC3D/target.mk @@ -2,10 +2,10 @@ F1_TARGETS += $(TARGET) FEATURES = ONBOARDFLASH VCP TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk index 3d89185d02..471cb43b87 100644 --- a/src/main/target/CHEBUZZF3/target.mk +++ b/src/main/target/CHEBUZZF3/target.mk @@ -2,17 +2,17 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_l3gd20.c \ - drivers/accgyro_lsm303dlhc.c \ - drivers/compass_hmc5883l.c \ - drivers/accgyro_adxl345.c \ - drivers/accgyro_bma280.c \ - drivers/accgyro_mma845x.c \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu3050.c \ - drivers/accgyro_mpu6050.c \ - drivers/accgyro_l3g4200d.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8975.c + drivers/accgyro/accgyro_l3gd20.c \ + drivers/accgyro/accgyro_lsm303dlhc.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/accgyro/accgyro_adxl345.c \ + drivers/accgyro/accgyro_bma280.c \ + drivers/accgyro/accgyro_mma845x.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu3050.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_l3g4200d.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8975.c diff --git a/src/main/target/CJMCU/hardware_revision.c b/src/main/target/CJMCU/hardware_revision.c index 181af9ed27..9a69720853 100755 --- a/src/main/target/CJMCU/hardware_revision.c +++ b/src/main/target/CJMCU/hardware_revision.c @@ -23,12 +23,7 @@ #include "build/build_config.h" -#include "drivers/accgyro.h" -#include "drivers/accgyro_spi_mpu6500.h" -#include "drivers/bus_spi.h" -#include "drivers/io.h" -#include "drivers/sensor.h" -#include "drivers/system.h" +#include "drivers/io_types.h" #include "hardware_revision.h" diff --git a/src/main/target/CJMCU/target.mk b/src/main/target/CJMCU/target.mk index 8da31647cf..d8e9e87676 100644 --- a/src/main/target/CJMCU/target.mk +++ b/src/main/target/CJMCU/target.mk @@ -2,9 +2,9 @@ F1_TARGETS += $(TARGET) FLASH_SIZE = 64 TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/compass/compass_hmc5883l.c \ blackbox/blackbox.c \ blackbox/blackbox_io.c \ telemetry/telemetry.c \ diff --git a/src/main/target/COLIBRI/target.mk b/src/main/target/COLIBRI/target.mk index 1a012d9871..9f7a73bd80 100644 --- a/src/main/target/COLIBRI/target.mk +++ b/src/main/target/COLIBRI/target.mk @@ -3,7 +3,7 @@ FEATURES += VCP ONBOARDFLASH HSE_VALUE = 16000000 TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/COLIBRI_RACE/i2c_bst.c b/src/main/target/COLIBRI_RACE/i2c_bst.c index feb3a0b831..ca5166ccc5 100644 --- a/src/main/target/COLIBRI_RACE/i2c_bst.c +++ b/src/main/target/COLIBRI_RACE/i2c_bst.c @@ -19,8 +19,8 @@ #include "drivers/system.h" #include "drivers/sensor.h" -#include "drivers/accgyro.h" -#include "drivers/compass.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/compass/compass.h" #include "drivers/serial.h" #include "drivers/bus_i2c.h" diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk index cd18a0b025..d1288d26a3 100644 --- a/src/main/target/COLIBRI_RACE/target.mk +++ b/src/main/target/COLIBRI_RACE/target.mk @@ -4,13 +4,13 @@ FEATURES = VCP TARGET_SRC = \ i2c_bst.c \ bus_bst_stm32f30x.c \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8963.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/DOGE/target.mk b/src/main/target/DOGE/target.mk index 700dfe7a53..e260b314e3 100644 --- a/src/main/target/DOGE/target.mk +++ b/src/main/target/DOGE/target.mk @@ -2,10 +2,10 @@ F3_TARGETS += $(TARGET) FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_spi_bmp280.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_spi_bmp280.c diff --git a/src/main/target/ELLE0/target.mk b/src/main/target/ELLE0/target.mk index b044290a7b..89263526de 100644 --- a/src/main/target/ELLE0/target.mk +++ b/src/main/target/ELLE0/target.mk @@ -3,7 +3,7 @@ FEATURES += VCP HSE_VALUE = 25000000 TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/compass_ak8963.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/compass/compass_ak8963.c diff --git a/src/main/target/F4BY/target.mk b/src/main/target/F4BY/target.mk index 12edbbb716..afe00b8138 100644 --- a/src/main/target/F4BY/target.mk +++ b/src/main/target/F4BY/target.mk @@ -2,7 +2,7 @@ F405_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/FISHDRONEF4/target.mk b/src/main/target/FISHDRONEF4/target.mk index c724536673..c31fe46817 100644 --- a/src/main/target/FISHDRONEF4/target.mk +++ b/src/main/target/FISHDRONEF4/target.mk @@ -2,7 +2,7 @@ F405_TARGETS += $(TARGET) FEATURES += SDCARD VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ drivers/max7456.c \ drivers/vtx_soft_spi_rtc6705.c diff --git a/src/main/target/FURYF3/target.mk b/src/main/target/FURYF3/target.mk index 1cbb887de4..dadfa469d2 100644 --- a/src/main/target/FURYF3/target.mk +++ b/src/main/target/FURYF3/target.mk @@ -2,11 +2,11 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_bmp280.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_spi_icm20689.c + drivers/accgyro/accgyro_mpu.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_spi_icm20689.c diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk index b35c30a577..65ece98777 100644 --- a/src/main/target/FURYF4/target.mk +++ b/src/main/target/FURYF4/target.mk @@ -2,9 +2,9 @@ F405_TARGETS += $(TARGET) FEATURES += SDCARD VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_icm20689.c \ - drivers/barometer_ms5611.c + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_icm20689.c \ + drivers/barometer/barometer_ms5611.c diff --git a/src/main/target/FURYF7/target.mk b/src/main/target/FURYF7/target.mk index 77cfc3e5f7..049b58c4d1 100644 --- a/src/main/target/FURYF7/target.mk +++ b/src/main/target/FURYF7/target.mk @@ -2,6 +2,6 @@ F7X5XG_TARGETS += $(TARGET) FEATURES += SDCARD VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_spi_icm20689.c \ + drivers/accgyro/accgyro_spi_icm20689.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c \ No newline at end of file diff --git a/src/main/target/IMPULSERCF3/target.mk b/src/main/target/IMPULSERCF3/target.mk index 3064e66d18..9a1ca5dc5b 100644 --- a/src/main/target/IMPULSERCF3/target.mk +++ b/src/main/target/IMPULSERCF3/target.mk @@ -2,7 +2,7 @@ F3_TARGETS += $(TARGET) FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/flash_m25p16.c diff --git a/src/main/target/IRCFUSIONF3/target.mk b/src/main/target/IRCFUSIONF3/target.mk index 1e7b96a538..fe03501b51 100644 --- a/src/main/target/IRCFUSIONF3/target.mk +++ b/src/main/target/IRCFUSIONF3/target.mk @@ -3,7 +3,7 @@ FEATURES = VCP ONBOARDFLASH TARGET_FLAGS = -DSPRACINGF3 TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/barometer_bmp085.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/barometer/barometer_bmp085.c diff --git a/src/main/target/ISHAPEDF3/target.mk b/src/main/target/ISHAPEDF3/target.mk index c322d07e00..0f1519f06b 100644 --- a/src/main/target/ISHAPEDF3/target.mk +++ b/src/main/target/ISHAPEDF3/target.mk @@ -2,6 +2,6 @@ F3_TARGETS += $(TARGET) FEATURES = ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/barometer_bmp280.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/barometer/barometer_bmp280.c diff --git a/src/main/target/KAKUTEF4/target.mk b/src/main/target/KAKUTEF4/target.mk index 10665d1634..3c8a3885b9 100644 --- a/src/main/target/KAKUTEF4/target.mk +++ b/src/main/target/KAKUTEF4/target.mk @@ -2,9 +2,9 @@ F405_TARGETS += $(TARGET) FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_spi_icm20689.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8963.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_spi_icm20689.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_hmc5883l.c \ drivers/max7456.c diff --git a/src/main/target/KISSFC/target.mk b/src/main/target/KISSFC/target.mk index 4b307e198c..81742f2417 100755 --- a/src/main/target/KISSFC/target.mk +++ b/src/main/target/KISSFC/target.mk @@ -2,7 +2,7 @@ F3_TARGETS += $(TARGET) FEATURES = VCP TARGET_SRC = \ - drivers/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu.c \ drivers/display_ug2864hsweg01.c \ - drivers/accgyro_mpu6050.c + drivers/accgyro/accgyro_mpu6050.c diff --git a/src/main/target/KIWIF4/target.mk b/src/main/target/KIWIF4/target.mk index 8a080dc251..a6eb0761e5 100644 --- a/src/main/target/KIWIF4/target.mk +++ b/src/main/target/KIWIF4/target.mk @@ -2,7 +2,7 @@ F405_TARGETS += $(TARGET) FEATURES += VCP ONBOARDFLASH SDCARD TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/max7456.c \ io/osd.c diff --git a/src/main/target/KROOZX/target.mk b/src/main/target/KROOZX/target.mk index 5c0a34c85a..33f2d3eeaf 100755 --- a/src/main/target/KROOZX/target.mk +++ b/src/main/target/KROOZX/target.mk @@ -3,7 +3,7 @@ FEATURES += VCP SDCARD HSE_VALUE = 16000000 TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c \ drivers/max7456.c \ No newline at end of file diff --git a/src/main/target/LUX_RACE/target.mk b/src/main/target/LUX_RACE/target.mk index ca59497685..ba6f65ede8 100644 --- a/src/main/target/LUX_RACE/target.mk +++ b/src/main/target/LUX_RACE/target.mk @@ -2,8 +2,8 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6000.c \ No newline at end of file + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ No newline at end of file diff --git a/src/main/target/MICROSCISKY/target.mk b/src/main/target/MICROSCISKY/target.mk index 274eb198da..b3f98e927f 100644 --- a/src/main/target/MICROSCISKY/target.mk +++ b/src/main/target/MICROSCISKY/target.mk @@ -1,9 +1,9 @@ F1_TARGETS += $(TARGET) TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/MOTOLAB/target.mk b/src/main/target/MOTOLAB/target.mk index a464efbde7..f4d23414f4 100644 --- a/src/main/target/MOTOLAB/target.mk +++ b/src/main/target/MOTOLAB/target.mk @@ -2,7 +2,7 @@ F3_TARGETS += $(TARGET) FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/accgyro_spi_mpu6000.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_spi_mpu6000.c diff --git a/src/main/target/MULTIFLITEPICO/target.mk b/src/main/target/MULTIFLITEPICO/target.mk index 0aa4e2c859..0fbfe6bd57 100755 --- a/src/main/target/MULTIFLITEPICO/target.mk +++ b/src/main/target/MULTIFLITEPICO/target.mk @@ -2,11 +2,11 @@ F3_TARGETS += $(TARGET) FEATURES = TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/NAZE/hardware_revision.c b/src/main/target/NAZE/hardware_revision.c index 62b31425f9..56a54a260a 100755 --- a/src/main/target/NAZE/hardware_revision.c +++ b/src/main/target/NAZE/hardware_revision.c @@ -23,12 +23,11 @@ #include "build/build_config.h" -#include "drivers/accgyro.h" -#include "drivers/accgyro_mpu.h" -#include "drivers/accgyro_mpu6500.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_mpu6500.h" #include "drivers/bus_spi.h" #include "drivers/io.h" -#include "drivers/sensor.h" #include "drivers/system.h" #include "hardware_revision.h" diff --git a/src/main/target/NAZE/target.mk b/src/main/target/NAZE/target.mk index d9371ed744..22c510c8cc 100644 --- a/src/main/target/NAZE/target.mk +++ b/src/main/target/NAZE/target.mk @@ -2,16 +2,16 @@ F1_TARGETS += $(TARGET) FEATURES = ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_adxl345.c \ - drivers/accgyro_bma280.c \ - drivers/accgyro_l3g4200d.c \ - drivers/accgyro_mma845x.c \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu3050.c \ - drivers/accgyro_mpu6050.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_adxl345.c \ + drivers/accgyro/accgyro_bma280.c \ + drivers/accgyro/accgyro_l3g4200d.c \ + drivers/accgyro/accgyro_mma845x.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu3050.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/NERO/target.mk b/src/main/target/NERO/target.mk index 587911cc98..d736768f00 100644 --- a/src/main/target/NERO/target.mk +++ b/src/main/target/NERO/target.mk @@ -2,7 +2,7 @@ F7X2RE_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c diff --git a/src/main/target/NUCLEOF7/target.mk b/src/main/target/NUCLEOF7/target.mk index f1e20157b6..8eeae80f82 100644 --- a/src/main/target/NUCLEOF7/target.mk +++ b/src/main/target/NUCLEOF7/target.mk @@ -2,11 +2,11 @@ F7X6XG_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_fake.c \ - drivers/accgyro_mpu6050.c \ - drivers/barometer_fake.c \ - drivers/barometer_ms5611.c \ - drivers/compass_fake.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_fake.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/barometer/barometer_fake.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_fake.c \ + drivers/compass/compass_hmc5883l.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c diff --git a/src/main/target/OMNIBUS/target.mk b/src/main/target/OMNIBUS/target.mk index c71d5c570f..6b2c7e02d0 100644 --- a/src/main/target/OMNIBUS/target.mk +++ b/src/main/target/OMNIBUS/target.mk @@ -2,11 +2,11 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_spi_bmp280.c \ - drivers/compass_ak8963.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_spi_bmp280.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/max7456.c diff --git a/src/main/target/OMNIBUSF4/target.mk b/src/main/target/OMNIBUSF4/target.mk index f880b4fa9e..055fedfd29 100644 --- a/src/main/target/OMNIBUSF4/target.mk +++ b/src/main/target/OMNIBUSF4/target.mk @@ -7,9 +7,9 @@ FEATURES += VCP ONBOARDFLASH endif TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_spi_bmp280.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_spi_bmp280.c \ + drivers/compass/compass_hmc5883l.c \ drivers/max7456.c diff --git a/src/main/target/PIKOBLX/target.mk b/src/main/target/PIKOBLX/target.mk index 3c5cd8c420..cc74aaeadb 100644 --- a/src/main/target/PIKOBLX/target.mk +++ b/src/main/target/PIKOBLX/target.mk @@ -2,5 +2,5 @@ F3_TARGETS += $(TARGET) FEATURES = VCP TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c diff --git a/src/main/target/RACEBASE/hardware_revision.c b/src/main/target/RACEBASE/hardware_revision.c index c70c754b3f..e5e85c26a4 100755 --- a/src/main/target/RACEBASE/hardware_revision.c +++ b/src/main/target/RACEBASE/hardware_revision.c @@ -29,9 +29,9 @@ #include "drivers/io.h" #include "drivers/gpio.h" #include "drivers/exti.h" -#include "drivers/accgyro.h" -#include "drivers/accgyro_mpu.h" -#include "drivers/accgyro_mpu6500.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/accgyro/accgyro_mpu.h" +#include "drivers/accgyro/accgyro_mpu6500.h" #include "hardware_revision.h" diff --git a/src/main/target/RACEBASE/target.mk b/src/main/target/RACEBASE/target.mk index 1e9cf90ba6..58fd4da6d9 100755 --- a/src/main/target/RACEBASE/target.mk +++ b/src/main/target/RACEBASE/target.mk @@ -3,8 +3,8 @@ F3_TARGETS += $(TARGET) FEATURES = ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ drivers/flash_m25p16.c \ drivers/max7456.c \ io/osd.c diff --git a/src/main/target/RCEXPLORERF3/target.mk b/src/main/target/RCEXPLORERF3/target.mk index 0b7a890b66..254db6c70d 100644 --- a/src/main/target/RCEXPLORERF3/target.mk +++ b/src/main/target/RCEXPLORERF3/target.mk @@ -2,11 +2,11 @@ F3_TARGETS += $(TARGET) FEATURES = VCP TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c \ - drivers/compass_ak8975.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c \ + drivers/compass/compass_ak8975.c \ drivers/display_ug2864hsweg01.c \ drivers/serial_usb_vcp.c \ drivers/flash_m25p16.c diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk index c1844c7f13..14efe57177 100644 --- a/src/main/target/REVO/target.mk +++ b/src/main/target/REVO/target.mk @@ -6,8 +6,8 @@ FEATURES = VCP ONBOARDFLASH endif TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/REVONANO/target.mk b/src/main/target/REVONANO/target.mk index 47f420b139..ce4d9fd8c3 100644 --- a/src/main/target/REVONANO/target.mk +++ b/src/main/target/REVONANO/target.mk @@ -2,6 +2,6 @@ F411_TARGETS += $(TARGET) FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_ms5611.c + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_ms5611.c diff --git a/src/main/target/RG_SSD_F3/target.mk b/src/main/target/RG_SSD_F3/target.mk index 39be156069..f63cc17fcc 100644 --- a/src/main/target/RG_SSD_F3/target.mk +++ b/src/main/target/RG_SSD_F3/target.mk @@ -2,8 +2,8 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c HSE_VALUE = 12000000 diff --git a/src/main/target/SINGULARITY/target.mk b/src/main/target/SINGULARITY/target.mk index fd4eb78419..17c5d35f9e 100644 --- a/src/main/target/SINGULARITY/target.mk +++ b/src/main/target/SINGULARITY/target.mk @@ -2,6 +2,6 @@ F3_TARGETS += $(TARGET) FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ drivers/vtx_rtc6705.c diff --git a/src/main/target/SIRINFPV/target.mk b/src/main/target/SIRINFPV/target.mk index 23a8b46be3..3c69d46f1d 100644 --- a/src/main/target/SIRINFPV/target.mk +++ b/src/main/target/SIRINFPV/target.mk @@ -2,13 +2,13 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/flash_m25p16.c \ drivers/vtx_soft_spi_rtc6705.c \ drivers/max7456.c diff --git a/src/main/target/SITL/target.c b/src/main/target/SITL/target.c index 4970780cdb..a42dc7cc83 100644 --- a/src/main/target/SITL/target.c +++ b/src/main/target/SITL/target.c @@ -36,7 +36,7 @@ #include "drivers/timer_def.h" const timerHardware_t timerHardware[1]; // unused -#include "drivers/accgyro_fake.h" +#include "drivers/accgyro/accgyro_fake.h" #include "flight/imu.h" #include "config/feature.h" diff --git a/src/main/target/SITL/target.mk b/src/main/target/SITL/target.mk index 5eef6ce06d..3b2e26b0fd 100644 --- a/src/main/target/SITL/target.mk +++ b/src/main/target/SITL/target.mk @@ -2,8 +2,8 @@ SITL_TARGETS += $(TARGET) #FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_fake.c \ - drivers/barometer_fake.c \ - drivers/compass_fake.c \ + drivers/accgyro/accgyro_fake.c \ + drivers/barometer/barometer_fake.c \ + drivers/compass/compass_fake.c \ drivers/serial_tcp.c diff --git a/src/main/target/SPARKY/target.mk b/src/main/target/SPARKY/target.mk index e57a5cff45..2911edc25d 100644 --- a/src/main/target/SPARKY/target.mk +++ b/src/main/target/SPARKY/target.mk @@ -2,9 +2,9 @@ F3_TARGETS += $(TARGET) FEATURES = VCP TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6050.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8975.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8975.c diff --git a/src/main/target/SPARKY2/target.mk b/src/main/target/SPARKY2/target.mk index 60869f5e64..6b658e85e9 100644 --- a/src/main/target/SPARKY2/target.mk +++ b/src/main/target/SPARKY2/target.mk @@ -2,9 +2,9 @@ F405_TARGETS += $(TARGET) FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_spi_mpu9250.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8963.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_spi_mpu9250.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_hmc5883l.c diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk index 3668a83e72..8095619d05 100644 --- a/src/main/target/SPRACINGF3/target.mk +++ b/src/main/target/SPRACINGF3/target.mk @@ -2,23 +2,23 @@ F3_TARGETS += $(TARGET) FEATURES = ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/barometer_ms5611.c \ - drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c + drivers/accgyro/accgyro_mpu.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c ifeq ($(TARGET), FLIP32F3OSD) TARGET_SRC += \ - drivers/accgyro_mpu6500.c + drivers/accgyro/accgyro_mpu6500.c else ifeq ($(TARGET), ZCOREF3) TARGET_SRC += \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c else TARGET_SRC += \ - drivers/accgyro_mpu6050.c + drivers/accgyro/accgyro_mpu6050.c endif endif diff --git a/src/main/target/SPRACINGF3EVO/target.mk b/src/main/target/SPRACINGF3EVO/target.mk index 58c2ba63de..bf60918251 100644 --- a/src/main/target/SPRACINGF3EVO/target.mk +++ b/src/main/target/SPRACINGF3EVO/target.mk @@ -2,9 +2,9 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8963.c + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8963.c diff --git a/src/main/target/SPRACINGF3MINI/target.mk b/src/main/target/SPRACINGF3MINI/target.mk index ef4cf55a75..992821b714 100644 --- a/src/main/target/SPRACINGF3MINI/target.mk +++ b/src/main/target/SPRACINGF3MINI/target.mk @@ -2,15 +2,15 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/compass_ak8963.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/flash_m25p16.c ifeq ($(TARGET), TINYBEEF3) TARGET_SRC += \ - drivers/accgyro_spi_mpu6500.c + drivers/accgyro/accgyro_spi_mpu6500.c endif diff --git a/src/main/target/SPRACINGF3NEO/config.c b/src/main/target/SPRACINGF3NEO/config.c index 9cbfe948c1..cb836c8ade 100644 --- a/src/main/target/SPRACINGF3NEO/config.c +++ b/src/main/target/SPRACINGF3NEO/config.c @@ -23,7 +23,7 @@ #include "common/axis.h" #include "drivers/sensor.h" -#include "drivers/compass.h" +#include "drivers/compass/compass.h" #include "drivers/serial.h" #include "fc/rc_controls.h" diff --git a/src/main/target/SPRACINGF3NEO/target.mk b/src/main/target/SPRACINGF3NEO/target.mk index 675bbda209..bd5d41ea74 100755 --- a/src/main/target/SPRACINGF3NEO/target.mk +++ b/src/main/target/SPRACINGF3NEO/target.mk @@ -2,13 +2,13 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/max7456.c \ drivers/vtx_rtc6705.c \ io/osd.c \ diff --git a/src/main/target/SPRACINGF3OSD/target.mk b/src/main/target/SPRACINGF3OSD/target.mk index b9712bcf01..288dd9340b 100644 --- a/src/main/target/SPRACINGF3OSD/target.mk +++ b/src/main/target/SPRACINGF3OSD/target.mk @@ -2,5 +2,5 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_fake.c \ + drivers/accgyro/accgyro_fake.c \ drivers/max7456.c diff --git a/src/main/target/SPRACINGF4EVO/config.c b/src/main/target/SPRACINGF4EVO/config.c index b843d07106..ec3b9d74c7 100644 --- a/src/main/target/SPRACINGF4EVO/config.c +++ b/src/main/target/SPRACINGF4EVO/config.c @@ -23,7 +23,7 @@ #include "common/axis.h" #include "drivers/sensor.h" -#include "drivers/compass.h" +#include "drivers/compass/compass.h" #include "drivers/serial.h" #include "fc/rc_controls.h" diff --git a/src/main/target/SPRACINGF4EVO/target.mk b/src/main/target/SPRACINGF4EVO/target.mk index 19fb2102c2..012e4d8bf4 100644 --- a/src/main/target/SPRACINGF4EVO/target.mk +++ b/src/main/target/SPRACINGF4EVO/target.mk @@ -2,12 +2,12 @@ F405_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/max7456.c \ drivers/transponder_ir.c \ drivers/vtx_rtc6705.c \ diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk index 181527be32..88f8eac34b 100644 --- a/src/main/target/STM32F3DISCOVERY/target.mk +++ b/src/main/target/STM32F3DISCOVERY/target.mk @@ -2,29 +2,29 @@ F3_TARGETS += $(TARGET) FEATURES = VCP SDCARD TARGET_SRC = \ - drivers/accgyro_adxl345.c \ - drivers/accgyro_bma280.c \ - drivers/accgyro_l3gd20.c \ - drivers/accgyro_l3g4200d.c \ - drivers/accgyro_lsm303dlhc.c \ - drivers/accgyro_adxl345.c \ - drivers/accgyro_fake.c \ - drivers/accgyro_bma280.c \ - drivers/accgyro_mma845x.c \ - drivers/accgyro_mpu.c \ - drivers/accgyro_mpu3050.c \ - drivers/accgyro_mpu6050.c \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_spi_mpu9250.c \ - drivers/barometer_bmp085.c \ - drivers/barometer_bmp280.c \ - drivers/barometer_fake.c \ - drivers/barometer_ms5611.c \ - drivers/compass_ak8963.c \ - drivers/compass_ak8975.c \ - drivers/compass_fake.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_adxl345.c \ + drivers/accgyro/accgyro_bma280.c \ + drivers/accgyro/accgyro_l3gd20.c \ + drivers/accgyro/accgyro_l3g4200d.c \ + drivers/accgyro/accgyro_lsm303dlhc.c \ + drivers/accgyro/accgyro_adxl345.c \ + drivers/accgyro/accgyro_fake.c \ + drivers/accgyro/accgyro_bma280.c \ + drivers/accgyro/accgyro_mma845x.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu3050.c \ + drivers/accgyro/accgyro_mpu6050.c \ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu9250.c \ + drivers/barometer/barometer_bmp085.c \ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_fake.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_ak8963.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_fake.c \ + drivers/compass/compass_hmc5883l.c \ drivers/flash_m25p16.c \ drivers/max7456.c diff --git a/src/main/target/TINYFISH/target.mk b/src/main/target/TINYFISH/target.mk index ee1225563f..0d256e76a8 100644 --- a/src/main/target/TINYFISH/target.mk +++ b/src/main/target/TINYFISH/target.mk @@ -2,6 +2,6 @@ F3_TARGETS += $(TARGET) FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ + drivers/accgyro/accgyro_mpu.c \ drivers/flash_m25p16.c \ - drivers/accgyro_spi_mpu6000.c + drivers/accgyro/accgyro_spi_mpu6000.c diff --git a/src/main/target/VRRACE/target.mk b/src/main/target/VRRACE/target.mk index b1fcd2be62..94927d4d4c 100644 --- a/src/main/target/VRRACE/target.mk +++ b/src/main/target/VRRACE/target.mk @@ -2,6 +2,6 @@ F405_TARGETS += $(TARGET) FEATURES += VCP TARGET_SRC = \ - drivers/accgyro_spi_mpu6000.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_mpu6500.c + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_mpu6500.c diff --git a/src/main/target/X_RACERSPI/target.mk b/src/main/target/X_RACERSPI/target.mk index 00e74dcf20..4ac13fe185 100644 --- a/src/main/target/X_RACERSPI/target.mk +++ b/src/main/target/X_RACERSPI/target.mk @@ -2,10 +2,10 @@ F3_TARGETS += $(TARGET) FEATURES = ONBOARDFLASH TARGET_SRC = \ - drivers/accgyro_mpu.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/compass_ak8975.c \ - drivers/compass_hmc5883l.c \ + drivers/accgyro/accgyro_mpu.c \ + drivers/accgyro/accgyro_spi_mpu6000.c \ + drivers/compass/compass_ak8975.c \ + drivers/compass/compass_hmc5883l.c \ drivers/display_ug2864hsweg01.h \ drivers/flash_m25p16.c diff --git a/src/main/target/YUPIF4/target.mk b/src/main/target/YUPIF4/target.mk index d484463b26..4efc03586c 100644 --- a/src/main/target/YUPIF4/target.mk +++ b/src/main/target/YUPIF4/target.mk @@ -2,9 +2,9 @@ F405_TARGETS += $(TARGET) FEATURES += SDCARD VCP TARGET_SRC = \ - drivers/accgyro_mpu6500.c \ - drivers/accgyro_spi_mpu6500.c \ - drivers/accgyro_spi_icm20689.c\ + drivers/accgyro/accgyro_mpu6500.c \ + drivers/accgyro/accgyro_spi_mpu6500.c \ + drivers/accgyro/accgyro_spi_icm20689.c\ drivers/max7456.c \ io/osd.c diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c index df292e9280..2abeb76acc 100644 --- a/src/main/telemetry/frsky.c +++ b/src/main/telemetry/frsky.c @@ -38,7 +38,7 @@ #include "drivers/system.h" #include "drivers/sensor.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "drivers/serial.h" #include "fc/config.h" diff --git a/src/main/telemetry/ibus.c b/src/main/telemetry/ibus.c index e805ad58fa..9596d67cb8 100644 --- a/src/main/telemetry/ibus.c +++ b/src/main/telemetry/ibus.c @@ -39,7 +39,7 @@ #include "drivers/system.h" #include "drivers/sensor.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "drivers/serial.h" #include "fc/rc_controls.h" diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c index 358084de4e..d536eecf9e 100644 --- a/src/main/telemetry/ltm.c +++ b/src/main/telemetry/ltm.c @@ -44,7 +44,7 @@ #include "drivers/system.h" #include "drivers/sensor.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "fc/config.h" #include "fc/rc_controls.h" diff --git a/src/main/telemetry/mavlink.c b/src/main/telemetry/mavlink.c index c6106da7f5..f35af45831 100755 --- a/src/main/telemetry/mavlink.c +++ b/src/main/telemetry/mavlink.c @@ -38,7 +38,7 @@ #include "drivers/system.h" #include "drivers/sensor.h" -#include "drivers/accgyro.h" +#include "drivers/accgyro/accgyro.h" #include "fc/config.h" #include "fc/rc_controls.h" diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c index abff32b1b4..2c77cb990e 100644 --- a/src/main/telemetry/smartport.c +++ b/src/main/telemetry/smartport.c @@ -20,8 +20,8 @@ #include "config/parameter_group.h" #include "config/parameter_group_ids.h" -#include "drivers/accgyro.h" -#include "drivers/compass.h" +#include "drivers/accgyro/accgyro.h" +#include "drivers/compass/compass.h" #include "drivers/sensor.h" #include "drivers/system.h"