Merge pull request #2830 from martinbudden/bf_directories

Created subdirectories in drivers directory

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 \

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"
 

src/main/drivers/accgyro/accMpu6000.cpp

@@ -0,0 +1,10 @@
+/*
+ * accMpu6000.cpp
+ *
+ *  Created on: 31 Mar 2017
+ *      Author: martinbudden
+ */
+
+
+
+

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 <pthread.h>
 #endif

src/main/drivers/accgyro/accgyro_adxl345.c

@@ -20,10 +20,10 @@
 
 #include <platform.h>
 
-#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"
 

src/main/drivers/accgyro/accgyro_bma280.c

@@ -20,9 +20,9 @@
 
 #include <platform.h>
 
-#include "bus_i2c.h"
+#include "drivers/bus_i2c.h"
 
-#include "sensor.h"
+#include "drivers/sensor.h"
 #include "accgyro.h"
 #include "accgyro_bma280.h"
 

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;

src/main/drivers/accgyro/accgyro_l3g4200d.c

@@ -20,13 +20,13 @@
 
 #include <platform.h>
 
-#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"
 

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"
 

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"
 

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"
 

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"

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
 

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"

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"

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"

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"
 

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,

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"

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)

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"
 

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
 

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"

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);
 

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);
 

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
 

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"

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,

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)

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"
 

src/main/drivers/adc_stm32f30x.c

@@ -20,15 +20,16 @@
 #include <string.h>
 
 #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"
 

src/main/drivers/adc_stm32f4xx.c

@@ -20,15 +20,16 @@
 #include <string.h>
 
 #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"

src/main/drivers/adc_stm32f7xx.c

@@ -20,15 +20,16 @@
 #include <string.h>
 
 #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"

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"
 

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;

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"

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

src/main/drivers/barometer/barometer_spi_bmp280.c

@@ -21,11 +21,11 @@
 
 #include <platform.h>
 
-#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)

src/main/drivers/barometer/barometer_spi_ms5611.c

@@ -20,8 +20,8 @@
 
 #include <platform.h>
 
-#include "io.h"
-#include "bus_spi.h"
+#include "drivers/io.h"
+#include "drivers/bus_spi.h"
 
 #include "barometer.h"
 #include "barometer_ms5611.h"

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))

src/main/drivers/bus_i2c_hal.c

@@ -20,11 +20,11 @@
 
 #include <platform.h>
 
-#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"
 

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)

src/main/drivers/bus_i2c_stm32f10x.c

@@ -21,11 +21,11 @@
 
 #include <platform.h>
 
-#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"
 

src/main/drivers/bus_i2c_stm32f30x.c

@@ -20,12 +20,12 @@
 
 #include <platform.h>
 
-#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
 

src/main/drivers/bus_spi.c

@@ -20,9 +20,9 @@
 
 #include <platform.h>
 
-#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"
 

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)

src/main/drivers/bus_spi_hal.c

@@ -20,11 +20,11 @@
 
 #include <platform.h>
 
-#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

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"
 
 

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

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

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.
 

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"

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"

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);

src/main/drivers/compass/compass_spi_hmc5883l.c

@@ -21,8 +21,8 @@
 
 #include <platform.h>
 
-#include "io.h"
-#include "bus_spi.h"
+#include "drivers/io.h"
+#include "drivers/bus_spi.h"
 
 #include "compass.h"
 #include "compass_hmc5883l.h"

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"
 

src/main/drivers/dma.c

@@ -21,7 +21,7 @@
 
 #include <platform.h>
 
-#include "nvic.h"
+#include "drivers/nvic.h"
 #include "dma.h"
 
 /*

src/main/drivers/dma_stm32f4xx.c

@@ -21,7 +21,7 @@
 
 #include <platform.h>
 
-#include "nvic.h"
+#include "drivers/nvic.h"
 #include "dma.h"
 #include "resource.h"
 

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
 

src/main/drivers/exti.h

@@ -20,7 +20,7 @@
 
 #include <stdbool.h>
 
-#include "io_types.h"
+#include "drivers/io_types.h"
 
 typedef struct extiCallbackRec_s extiCallbackRec_t;
 typedef void extiHandlerCallback(extiCallbackRec_t *self);

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

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)
 {

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

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

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

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)

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);

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"

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"
 

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)

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;

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)

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"

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)

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

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"
 

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"
 

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"