Merge pull request cleanflight#2641 from cleanflight/betaflight-master

Merge betaflight master changes

.gitignore

@@ -28,3 +28,4 @@ make/local.mk
 
 mcu.mak
 mcu.mak.old
+stm32.mak

.travis.yml

@@ -82,7 +82,7 @@ install:
   - make arm_sdk_install
 
 before_script:
-  - tools/gcc-arm-none-eabi-6_2-2016q4/bin/arm-none-eabi-gcc --version
+  - tools/gcc-arm-none-eabi-6-2017-q1-update/bin/arm-none-eabi-gcc --version
   - clang --version
   - clang++ --version
 

Makefile

@@ -663,6 +663,7 @@ COMMON_SRC = \
             drivers/serial_escserial.c \
             drivers/sonar_hcsr04.c \
             drivers/vtx_common.c \
+            drivers/transponder_ir.c \
             flight/navigation.c \
             io/dashboard.c \
             io/displayport_max7456.c \
@@ -671,6 +672,7 @@ COMMON_SRC = \
             io/gps.c \
             io/ledstrip.c \
             io/osd.c \
+            io/transponder_ir.c \
             sensors/sonar.c \
             sensors/barometer.c \
             telemetry/telemetry.c \
@@ -815,7 +817,7 @@ STM32F10x_COMMON_SRC = \
             drivers/dma.c \
             drivers/gpio_stm32f10x.c \
             drivers/inverter.c \
-            drivers/light_ws2811strip_stm32f10x.c \
+            drivers/light_ws2811strip_stdperiph.c \
             drivers/serial_uart_stm32f10x.c \
             drivers/system_stm32f10x.c \
             drivers/timer_stm32f10x.c
@@ -826,8 +828,8 @@ STM32F30x_COMMON_SRC = \
             drivers/bus_i2c_stm32f30x.c \
             drivers/dma.c \
             drivers/gpio_stm32f30x.c \
-            drivers/light_ws2811strip_stm32f30x.c \
-            drivers/pwm_output_stm32f3xx.c \
+            drivers/light_ws2811strip_stdperiph.c \
+            drivers/pwm_output_dshot.c \
             drivers/serial_uart_stm32f30x.c \
             drivers/system_stm32f30x.c \
             drivers/timer_stm32f30x.c
@@ -840,8 +842,8 @@ STM32F4xx_COMMON_SRC = \
             drivers/dma_stm32f4xx.c \
             drivers/gpio_stm32f4xx.c \
             drivers/inverter.c \
-            drivers/light_ws2811strip_stm32f4xx.c \
-            drivers/pwm_output_stm32f4xx.c \
+            drivers/light_ws2811strip_stdperiph.c \
+            drivers/pwm_output_dshot.c \
             drivers/serial_uart_stm32f4xx.c \
             drivers/system_stm32f4xx.c \
             drivers/timer_stm32f4xx.c
@@ -878,7 +880,7 @@ else ifeq ($(TARGET),$(filter $(TARGET),$(F1_TARGETS)))
 TARGET_SRC := $(STARTUP_SRC) $(STM32F10x_COMMON_SRC) $(TARGET_SRC)
 endif
 
-ifneq ($(filter GYROFFT,$(FEATURES)),)
+ifneq ($(filter $(TARGET),$(F4_TARGETS) $(F7_TARGETS)),)
 DSPLIB := $(ROOT)/lib/main/DSP_Lib
 DEVICE_FLAGS += -DARM_MATH_CM4 -DARM_MATH_MATRIX_CHECK -DARM_MATH_ROUNDING -D__FPU_PRESENT=1 -DUNALIGNED_SUPPORT_DISABLE
 

lib/main/CMSIS/CM4/CoreSupport/arm_math.h

@@ -5215,7 +5215,7 @@ void arm_rfft_fast_f32(
 #pragma GCC diagnostic ignored "-Wpedantic"
     /* saturate the output */
     out = (q15_t) (__SSAT((acc >> 15), 16));
-#pragma GCC diagnostic push
+#pragma GCC diagnostic pop
 
     /* Update state */
     S->state[1] = S->state[0];