Merge pull request #2909 from opentx/projectkk2glider/issue_2905_mavlink_broken

Fixes #2950: Mavlink build option was not working
This commit is contained in:
Bertrand Songis
2015-09-20 12:02:35 +02:00
3 changed files with 11 additions and 4 deletions
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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