From 407289e1d1d906fd91d572d38ee2cd0b8d4f9200 Mon Sep 17 00:00:00 2001
From: Damjan Adamic <projectkk2glider@gmail.com>
Date: Sun, 20 Sep 2015 11:47:21 +0200
Subject: [PATCH] Fixes #2950: Mavlink build option was not working

---
 radio/src/Makefile         | 2 +-
 radio/src/myeeprom.h       | 6 +++---
 radio/util/commit-tests.sh | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/radio/src/Makefile b/radio/src/Makefile
index 5e0db2170..430e4a601 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1273,7 +1273,7 @@ endif
 
 ifeq ($(EXT), MAVLINK)
   CPPDEFS += -DMAVLINK
-  INCDIRS += thirdparty
+  INCDIRS += thirdparty targets/common_avr/
   CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp targets/common_avr/serial_driver.cpp
   EEPROM_VARIANT += ${MAVLINK_VARIANT}
 endif
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index f9f133fd9..c1c5503e8 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -2074,10 +2074,10 @@ enum FailsafeModes {
   FAILSAFE_LAST = FAILSAFE_RECEIVER
 };
 
-#if defined(FRSKY) || !defined(PCBSTD)
-  #define TELEMETRY_DATA FrSkyData frsky;
-#elif defined(MAVLINK)
+#if defined(MAVLINK)
   #define TELEMETRY_DATA MavlinkData mavlink;
+#elif defined(FRSKY) || !defined(PCBSTD)
+  #define TELEMETRY_DATA FrSkyData frsky;
 #else
   #define TELEMETRY_DATA
 #endif
diff --git a/radio/util/commit-tests.sh b/radio/util/commit-tests.sh
index 3310e26fe..8aa8abaad 100755
--- a/radio/util/commit-tests.sh
+++ b/radio/util/commit-tests.sh
@@ -13,6 +13,10 @@ make simu PCB=9X EXT=FRSKY HELI=YES
 make gtests EXT=FRSKY HELI=YES
 ./gtests
 
+# OpenTX on 9X stock with MAVLINK
+make clean
+make PCB=9X EXT=MAVLINK HELI=YES
+
 # OpenTX on Taranis X9E
 make clean
 make PCB=TARANIS PCBREV=REV9E HELI=YES GVARS=YES LUA=YES
@@ -50,3 +54,6 @@ make simu PCB=GRUVIN9X EXT=FRSKY SDCARD=YES
 make clean
 make PCB=MEGA2560
 
+# OpenTX on MEGA2560 with MAVLINK
+make clean
+make PCB=MEGA2560 EXT=MAVLINK