diff --git a/src/main/main.c b/src/main/main.c
index 15d2b6cba..1948a72ac 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -320,7 +320,7 @@ void init(void)
     bool use_unsyncedPwm = masterConfig.use_unsyncedPwm || masterConfig.motor_pwm_protocol == PWM_TYPE_CONVENTIONAL || masterConfig.motor_pwm_protocol == PWM_TYPE_BRUSHED;
 
     // Configurator feature abused for enabling Fast PWM
-    pwm_params.useFastPwm = (masterConfig.motor_pwm_protocol != PWM_TYPE_CONVENTIONAL && masterConfig.motor_pwm_protocol != PWM_TYPE_BRUSHED); 
+    pwm_params.useFastPwm = (masterConfig.motor_pwm_protocol != PWM_TYPE_CONVENTIONAL && masterConfig.motor_pwm_protocol != PWM_TYPE_BRUSHED);
     pwm_params.pwmProtocolType = masterConfig.motor_pwm_protocol;
     pwm_params.motorPwmRate = use_unsyncedPwm ? masterConfig.motor_pwm_rate : 0;
     pwm_params.idlePulse = masterConfig.escAndServoConfig.mincommand;
@@ -716,7 +716,7 @@ void main_init(void)
         }
         rescheduleTask(TASK_ACCEL, accTargetLooptime);
     }
-    setTaskEnabled(TASK_ACCEL, sensors(SENSOR_ACC));
+
     setTaskEnabled(TASK_ATTITUDE, sensors(SENSOR_ACC));
     setTaskEnabled(TASK_SERIAL, true);
 #ifdef BEEPER
diff --git a/src/main/target/ALIENFLIGHTF1/target.mk b/src/main/target/ALIENFLIGHTF1/target.mk
index 07d81cf44..e5fbfe8c9 100644
--- a/src/main/target/ALIENFLIGHTF1/target.mk
+++ b/src/main/target/ALIENFLIGHTF1/target.mk
@@ -1,20 +1,20 @@
-F1_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH HIGHEND 
-
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND 
+
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/sonar_hcsr04.c
diff --git a/src/main/target/ALIENFLIGHTF3/target.mk b/src/main/target/ALIENFLIGHTF3/target.mk
index f1449b704..90e0b83f1 100644
--- a/src/main/target/ALIENFLIGHTF3/target.mk
+++ b/src/main/target/ALIENFLIGHTF3/target.mk
@@ -1,11 +1,11 @@
-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/sonar_hcsr04.c
-
+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/sonar_hcsr04.c
+
diff --git a/src/main/target/ALIENFLIGHTF4/target.mk b/src/main/target/ALIENFLIGHTF4/target.mk
index 910023aa0..edd75eefb 100644
--- a/src/main/target/ALIENFLIGHTF4/target.mk
+++ b/src/main/target/ALIENFLIGHTF4/target.mk
@@ -1,13 +1,13 @@
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
-
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f4xx.c
+
diff --git a/src/main/target/BLUEJAYF4/target.mk b/src/main/target/BLUEJAYF4/target.mk
index f52396562..23dd74507 100644
--- a/src/main/target/BLUEJAYF4/target.mk
+++ b/src/main/target/BLUEJAYF4/target.mk
@@ -1,10 +1,10 @@
-F405_TARGETS    += $(TARGET)
-FEATURES        += SDCARD VCP
-
-TARGET_SRC = \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/barometer_ms5611.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f4xx.c
-
+F405_TARGETS    += $(TARGET)
+FEATURES        += SDCARD VCP
+
+TARGET_SRC = \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/barometer_ms5611.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f4xx.c
+
diff --git a/src/main/target/CC3D/target.mk b/src/main/target/CC3D/target.mk
index 2718c0302..7bf5bc80b 100644
--- a/src/main/target/CC3D/target.mk
+++ b/src/main/target/CC3D/target.mk
@@ -1,14 +1,14 @@
-F1_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH HIGHEND 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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
-
+F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND 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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/CHEBUZZF3/target.mk b/src/main/target/CHEBUZZF3/target.mk
index e90db6d09..63e6409e3 100644
--- a/src/main/target/CHEBUZZF3/target.mk
+++ b/src/main/target/CHEBUZZF3/target.mk
@@ -1,19 +1,19 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD
-
-TARGET_SRC = \
-            drivers/light_ws2811strip.c \
-            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
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP SDCARD
+
+TARGET_SRC = \
+            drivers/light_ws2811strip.c \
+            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
+
diff --git a/src/main/target/CJMCU/target.mk b/src/main/target/CJMCU/target.mk
index 69a1ecc9f..72f2c64b0 100644
--- a/src/main/target/CJMCU/target.mk
+++ b/src/main/target/CJMCU/target.mk
@@ -1,11 +1,11 @@
-F1_TARGETS  += $(TARGET)
-FLASH_SIZE  = 64
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6050.c \
-            drivers/compass_hmc5883l.c \
-            flight/gtune.c \
-            blackbox/blackbox.c \
-            blackbox/blackbox_io.c
-
+F1_TARGETS  += $(TARGET)
+FLASH_SIZE  = 64
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6050.c \
+            drivers/compass_hmc5883l.c \
+            flight/gtune.c \
+            blackbox/blackbox.c \
+            blackbox/blackbox_io.c
+
diff --git a/src/main/target/COLIBRI_RACE/target.mk b/src/main/target/COLIBRI_RACE/target.mk
index b59d32d0e..1632ce30b 100644
--- a/src/main/target/COLIBRI_RACE/target.mk
+++ b/src/main/target/COLIBRI_RACE/target.mk
@@ -1,18 +1,18 @@
-F3_TARGETS  += $(TARGET)
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
-
+F3_TARGETS  += $(TARGET)
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c
+
diff --git a/src/main/target/DOGE/target.mk b/src/main/target/DOGE/target.mk
index f44e26c5b..869947318 100644
--- a/src/main/target/DOGE/target.mk
+++ b/src/main/target/DOGE/target.mk
@@ -1,12 +1,12 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP ONBOARDFLASH
-
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP ONBOARDFLASH
+
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c
+
diff --git a/src/main/target/EUSTM32F103RC/target.mk b/src/main/target/EUSTM32F103RC/target.mk
index b315c0aac..aa9ccbf8e 100644
--- a/src/main/target/EUSTM32F103RC/target.mk
+++ b/src/main/target/EUSTM32F103RC/target.mk
@@ -1,25 +1,25 @@
-F1_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH HIGHEND 
-
-DEVICE_FLAGS    = -DSTM32F10X_HD
-
-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_mpu6000.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/barometer_bmp085.c \
-            drivers/barometer_bmp280.c \
-            drivers/barometer_ms5611.c \
-            drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
-
+F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND 
+
+DEVICE_FLAGS    = -DSTM32F10X_HD
+
+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_mpu6000.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/barometer_bmp085.c \
+            drivers/barometer_bmp280.c \
+            drivers/barometer_ms5611.c \
+            drivers/compass_ak8975.c \
+            drivers/compass_hmc5883l.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/F4BY/target.mk b/src/main/target/F4BY/target.mk
index 5093a8df7..12edbbb71 100644
--- a/src/main/target/F4BY/target.mk
+++ b/src/main/target/F4BY/target.mk
@@ -1,8 +1,8 @@
-F405_TARGETS    += $(TARGET)
-FEATURES        += SDCARD VCP
-
-TARGET_SRC = \
-             drivers/accgyro_spi_mpu6000.c \
-             drivers/barometer_ms5611.c \
-             drivers/compass_hmc5883l.c
-
+F405_TARGETS    += $(TARGET)
+FEATURES        += SDCARD VCP
+
+TARGET_SRC = \
+             drivers/accgyro_spi_mpu6000.c \
+             drivers/barometer_ms5611.c \
+             drivers/compass_hmc5883l.c
+
diff --git a/src/main/target/FURYF3/target.mk b/src/main/target/FURYF3/target.mk
index c68651f01..2f1639e86 100644
--- a/src/main/target/FURYF3/target.mk
+++ b/src/main/target/FURYF3/target.mk
@@ -1,15 +1,15 @@
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/sonar_hcsr04.c \
-            drivers/serial_softserial.c
-
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/sonar_hcsr04.c \
+            drivers/serial_softserial.c
+
diff --git a/src/main/target/FURYF4/target.mk b/src/main/target/FURYF4/target.mk
index e22fad504..958e5c68d 100644
--- a/src/main/target/FURYF4/target.mk
+++ b/src/main/target/FURYF4/target.mk
@@ -1,9 +1,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/barometer_ms5611.c
-
+F405_TARGETS    += $(TARGET)
+FEATURES        += SDCARD VCP ONBOARDFLASH
+
+TARGET_SRC = \
+            drivers/accgyro_spi_mpu6000.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/barometer_ms5611.c
+
diff --git a/src/main/target/IRCFUSIONF3/target.mk b/src/main/target/IRCFUSIONF3/target.mk
index 5c10e856b..1e7b96a53 100644
--- a/src/main/target/IRCFUSIONF3/target.mk
+++ b/src/main/target/IRCFUSIONF3/target.mk
@@ -1,9 +1,9 @@
-F3_TARGETS   += $(TARGET)
-FEATURES     = VCP ONBOARDFLASH
-TARGET_FLAGS = -DSPRACINGF3
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6050.c \
-            drivers/barometer_bmp085.c
-
+F3_TARGETS   += $(TARGET)
+FEATURES     = VCP ONBOARDFLASH
+TARGET_FLAGS = -DSPRACINGF3
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6050.c \
+            drivers/barometer_bmp085.c
+
diff --git a/src/main/target/KISSFC/target.c b/src/main/target/KISSFC/target.c
index dc7c159b8..167265ed7 100644
--- a/src/main/target/KISSFC/target.c
+++ b/src/main/target/KISSFC/target.c
@@ -66,8 +66,6 @@ const uint16_t airPWM[] = {
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM1,  IO_TAG(PA8),  TIM_Channel_1, TIM1_CC_IRQn,            TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_INVERTED, IOCFG_AF_PP, GPIO_AF_6},
     { TIM3,  IO_TAG(PB0),  TIM_Channel_3, TIM3_IRQn,               TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_INVERTED, IOCFG_AF_PP, GPIO_AF_2},
-    //{ TIM1,  IO_TAG(PB14), TIM_Channel_2, TIM1_CC_IRQn,            TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_N_CHANNEL, IOCFG_AF_PP, GPIO_AF_6}, // TIM1_CH2N
-    //{ TIM1,  IO_TAG(PB15), TIM_Channel_3, TIM1_CC_IRQn,            TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_N_CHANNEL, IOCFG_AF_PP, GPIO_AF_4}, // TIM1_CH3N
     { TIM15, IO_TAG(PB14), TIM_Channel_1, TIM1_BRK_TIM15_IRQn,     TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_INVERTED, IOCFG_AF_PP, GPIO_AF_1},
     { TIM15, IO_TAG(PB15), TIM_Channel_2, TIM1_BRK_TIM15_IRQn,     TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_INVERTED, IOCFG_AF_PP, GPIO_AF_1},
     { TIM16, IO_TAG(PA6),  TIM_Channel_1, TIM1_UP_TIM16_IRQn,      TIMER_OUTPUT_ENABLED|TIMER_OUTPUT_INVERTED, IOCFG_AF_PP, GPIO_AF_1},
diff --git a/src/main/target/KISSFC/target.mk b/src/main/target/KISSFC/target.mk
index 6ed94fd46..c59af03e5 100644
--- a/src/main/target/KISSFC/target.mk
+++ b/src/main/target/KISSFC/target.mk
@@ -1,8 +1,8 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/display_ug2864hsweg01.c \
-            drivers/accgyro_mpu6050.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/display_ug2864hsweg01.c \
+            drivers/accgyro_mpu6050.c
+
diff --git a/src/main/target/LUX_RACE/target.mk b/src/main/target/LUX_RACE/target.mk
index 1a77b54ea..2f6ba2d53 100644
--- a/src/main/target/LUX_RACE/target.mk
+++ b/src/main/target/LUX_RACE/target.mk
@@ -1,11 +1,11 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP 
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP 
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c
+
diff --git a/src/main/target/MOTOLAB/target.mk b/src/main/target/MOTOLAB/target.mk
index 9dfcb8bb8..596dedfbc 100644
--- a/src/main/target/MOTOLAB/target.mk
+++ b/src/main/target/MOTOLAB/target.mk
@@ -1,13 +1,13 @@
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c
-
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_softserial.c
+
diff --git a/src/main/target/NAZE/target.mk b/src/main/target/NAZE/target.mk
index 07d81cf44..e5fbfe8c9 100644
--- a/src/main/target/NAZE/target.mk
+++ b/src/main/target/NAZE/target.mk
@@ -1,20 +1,20 @@
-F1_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH HIGHEND 
-
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
+F1_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH HIGHEND 
+
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/sonar_hcsr04.c
diff --git a/src/main/target/OLIMEXINO/target.mk b/src/main/target/OLIMEXINO/target.mk
index b299c9ffd..6834b6126 100644
--- a/src/main/target/OLIMEXINO/target.mk
+++ b/src/main/target/OLIMEXINO/target.mk
@@ -1,13 +1,13 @@
-F1_TARGETS  += $(TARGET)
-FEATURES    = HIGHEND 
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6050.c \
-            drivers/barometer_bmp085.c \
-            drivers/barometer_bmp280.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
-
+F1_TARGETS  += $(TARGET)
+FEATURES    = HIGHEND 
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6050.c \
+            drivers/barometer_bmp085.c \
+            drivers/barometer_bmp280.c \
+            drivers/compass_hmc5883l.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/PIKOBLX/target.mk b/src/main/target/PIKOBLX/target.mk
index 3662ea997..3192c18c4 100644
--- a/src/main/target/PIKOBLX/target.mk
+++ b/src/main/target/PIKOBLX/target.mk
@@ -1,13 +1,13 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_spi_mpu6000.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/transponder_ir.c \
-            drivers/transponder_ir_stm32f30x.c \
-            io/transponder_ir.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_spi_mpu6000.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_softserial.c \
+            drivers/transponder_ir.c \
+            drivers/transponder_ir_stm32f30x.c \
+            io/transponder_ir.c
+
diff --git a/src/main/target/PORT103R/target.mk b/src/main/target/PORT103R/target.mk
index 2246dc605..86cf70fb5 100644
--- a/src/main/target/PORT103R/target.mk
+++ b/src/main/target/PORT103R/target.mk
@@ -1,28 +1,28 @@
-F1_TARGETS  += $(TARGET)
-256K_TARGETS += $(TARGET)
-FLASH_SIZE = 256
-
-FEATURES     = ONBOARDFLASH HIGHEND 
-
-DEVICE_FLAGS    = -DSTM32F10X_HD
-
-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_mpu6000.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/barometer_bmp085.c \
-            drivers/barometer_bmp280.c \
-            drivers/barometer_ms5611.c \
-            drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f10x.c \
-            drivers/sonar_hcsr04.c
-
+F1_TARGETS  += $(TARGET)
+256K_TARGETS += $(TARGET)
+FLASH_SIZE = 256
+
+FEATURES     = ONBOARDFLASH HIGHEND 
+
+DEVICE_FLAGS    = -DSTM32F10X_HD
+
+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_mpu6000.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/barometer_bmp085.c \
+            drivers/barometer_bmp280.c \
+            drivers/barometer_ms5611.c \
+            drivers/compass_ak8975.c \
+            drivers/compass_hmc5883l.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/REVO/target.mk b/src/main/target/REVO/target.mk
index 21c242fe4..7347dd10f 100644
--- a/src/main/target/REVO/target.mk
+++ b/src/main/target/REVO/target.mk
@@ -1,8 +1,8 @@
-F405_TARGETS   += $(TARGET)
-FEATURES       += VCP ONBOARDFLASH
-
-TARGET_SRC = \
-            drivers/accgyro_spi_mpu6000.c \
-            drivers/barometer_ms5611.c \
-            drivers/compass_hmc5883l.c
-
+F405_TARGETS   += $(TARGET)
+FEATURES       += VCP ONBOARDFLASH
+
+TARGET_SRC = \
+            drivers/accgyro_spi_mpu6000.c \
+            drivers/barometer_ms5611.c \
+            drivers/compass_hmc5883l.c
+
diff --git a/src/main/target/REVONANO/target.mk b/src/main/target/REVONANO/target.mk
index 42cce14ff..af9876e35 100644
--- a/src/main/target/REVONANO/target.mk
+++ b/src/main/target/REVONANO/target.mk
@@ -1,6 +1,6 @@
-F411_TARGETS   += $(TARGET)
-FEATURES       += VCP ONBOARDFLASH
-
-TARGET_SRC = \
-		   drivers/accgyro_spi_mpu9250.c \
+F411_TARGETS   += $(TARGET)
+FEATURES       += VCP ONBOARDFLASH
+
+TARGET_SRC = \
+		   drivers/accgyro_spi_mpu9250.c \
 		   drivers/barometer_ms5611.c
\ No newline at end of file
diff --git a/src/main/target/RMDO/target.mk b/src/main/target/RMDO/target.mk
index ccbbd5a8e..ec0fc084d 100644
--- a/src/main/target/RMDO/target.mk
+++ b/src/main/target/RMDO/target.mk
@@ -1,13 +1,13 @@
-F3_TARGETS   += $(TARGET)
-FEATURES     = VCP ONBOARDFLASH
-TARGET_FLAGS = -DSPRACINGF3
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6050.c \
-            drivers/barometer_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
-
+F3_TARGETS   += $(TARGET)
+FEATURES     = VCP ONBOARDFLASH
+TARGET_FLAGS = -DSPRACINGF3
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6050.c \
+            drivers/barometer_bmp280.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_softserial.c \
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/SINGULARITY/target.mk b/src/main/target/SINGULARITY/target.mk
index 1cd4fcd94..bdae168d9 100644
--- a/src/main/target/SINGULARITY/target.mk
+++ b/src/main/target/SINGULARITY/target.mk
@@ -1,12 +1,12 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP ONBOARDFLASH
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6050.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/vtx_rtc6705.c \
-            io/vtx.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP ONBOARDFLASH
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6050.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_softserial.c \
+            drivers/vtx_rtc6705.c \
+            io/vtx.c
+
diff --git a/src/main/target/SPARKY/target.mk b/src/main/target/SPARKY/target.mk
index 76ea72b12..f4de2539f 100644
--- a/src/main/target/SPARKY/target.mk
+++ b/src/main/target/SPARKY/target.mk
@@ -1,12 +1,12 @@
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
-
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c
+
diff --git a/src/main/target/SPRACINGF3/target.mk b/src/main/target/SPRACINGF3/target.mk
index ed7391c7a..2d8711dfb 100644
--- a/src/main/target/SPRACINGF3/target.mk
+++ b/src/main/target/SPRACINGF3/target.mk
@@ -1,16 +1,16 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH
-
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/sonar_hcsr04.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH
+
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_softserial.c \
+            drivers/sonar_hcsr04.c
+
diff --git a/src/main/target/SPRACINGF3EVO/target.mk b/src/main/target/SPRACINGF3EVO/target.mk
index 9b179afe4..086683412 100644
--- a/src/main/target/SPRACINGF3EVO/target.mk
+++ b/src/main/target/SPRACINGF3EVO/target.mk
@@ -1,16 +1,16 @@
-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/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_usb_vcp.c \
-            drivers/transponder_ir.c \
-            drivers/transponder_ir_stm32f30x.c \
-            io/transponder_ir.c
-
+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/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_usb_vcp.c \
+            drivers/transponder_ir.c \
+            drivers/transponder_ir_stm32f30x.c \
+            io/transponder_ir.c
+
diff --git a/src/main/target/SPRACINGF3MINI/target.mk b/src/main/target/SPRACINGF3MINI/target.mk
index 1c1e3b9a5..5c16c88a7 100644
--- a/src/main/target/SPRACINGF3MINI/target.mk
+++ b/src/main/target/SPRACINGF3MINI/target.mk
@@ -1,19 +1,19 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD 
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/barometer_bmp280.c \
-            drivers/compass_ak8975.c \
-            drivers/compass_hmc5883l.c \
-            drivers/flash_m25p16.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/serial_softserial.c \
-            drivers/serial_usb_vcp.c \
-            drivers/sonar_hcsr04.c \
-            drivers/transponder_ir.c \
-            drivers/transponder_ir_stm32f30x.c \
-            io/transponder_ir.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP SDCARD 
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/barometer_bmp280.c \
+            drivers/compass_ak8975.c \
+            drivers/compass_hmc5883l.c \
+            drivers/flash_m25p16.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c \
+            drivers/serial_softserial.c \
+            drivers/serial_usb_vcp.c \
+            drivers/sonar_hcsr04.c \
+            drivers/transponder_ir.c \
+            drivers/transponder_ir_stm32f30x.c \
+            io/transponder_ir.c
+
diff --git a/src/main/target/STM32F3DISCOVERY/target.mk b/src/main/target/STM32F3DISCOVERY/target.mk
index 9f3645c97..e3eb8bffd 100644
--- a/src/main/target/STM32F3DISCOVERY/target.mk
+++ b/src/main/target/STM32F3DISCOVERY/target.mk
@@ -1,22 +1,22 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = VCP SDCARD
-
-TARGET_SRC = \
-            drivers/light_ws2811strip.c \
-            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_mpu6500.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_l3g4200d.c \
-            drivers/barometer_ms5611.c \
-            drivers/barometer_bmp280.c \
-            drivers/compass_ak8975.c \
-            drivers/max7456.c \
-            io/osd.c
+F3_TARGETS  += $(TARGET)
+FEATURES    = VCP SDCARD
+
+TARGET_SRC = \
+            drivers/light_ws2811strip.c \
+            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_mpu6500.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/accgyro_l3g4200d.c \
+            drivers/barometer_ms5611.c \
+            drivers/barometer_bmp280.c \
+            drivers/compass_ak8975.c \
+            drivers/max7456.c \
+            io/osd.c
diff --git a/src/main/target/ZCOREF3/target.mk b/src/main/target/ZCOREF3/target.mk
index 4b232a787..39b7b5d00 100644
--- a/src/main/target/ZCOREF3/target.mk
+++ b/src/main/target/ZCOREF3/target.mk
@@ -1,11 +1,11 @@
-F3_TARGETS  += $(TARGET)
-FEATURES    = ONBOARDFLASH
-
-TARGET_SRC = \
-            drivers/accgyro_mpu.c \
-            drivers/accgyro_mpu6500.c \
-            drivers/accgyro_spi_mpu6500.c \
-            drivers/barometer_bmp280.c \
-            drivers/light_ws2811strip.c \
-            drivers/light_ws2811strip_stm32f30x.c
-
+F3_TARGETS  += $(TARGET)
+FEATURES    = ONBOARDFLASH
+
+TARGET_SRC = \
+            drivers/accgyro_mpu.c \
+            drivers/accgyro_mpu6500.c \
+            drivers/accgyro_spi_mpu6500.c \
+            drivers/barometer_bmp280.c \
+            drivers/light_ws2811strip.c \
+            drivers/light_ws2811strip_stm32f30x.c
+