Merge remote-tracking branch 'upstream/master' into travis

Conflicts:
	.travis.yml

.travis.yml

@@ -1,7 +1,7 @@
 env:
   - RUNTESTS=True
   - TARGET=CC3D
-  - TARGET=CC3D OPBL=yes
+  - TARGET=CC3D OPBL=yes 
   - TARGET=CHEBUZZF3
   - TARGET=CJMCU
   - TARGET=EUSTM32F103RC

Makefile

@@ -374,6 +374,7 @@ endif
 
 ifeq ($(OPBL),yes)
 ifneq ($(filter $(TARGET),$(OPBL_VALID_TARGETS)),)
+TARGET_FLAGS := -DOPBL $(TARGET_FLAGS)
 LD_SCRIPT	 = $(LINKER_DIR)/stm32_flash_f103_128k_opbl.ld
 .DEFAULT_GOAL := binary
 else

src/main/target/CC3D/target.h

@@ -114,6 +114,10 @@
 #define AUTOTUNE
 #define USE_SERVOS
 
+#if defined(OPBL)
+#undef AUTOTUNE // disabled for OPBL build due to code size.
+#endif
+
 #define SPEKTRUM_BIND
 // USART3, PB11 (Flexport)
 #define BIND_PORT  GPIOB