Fixes #2950: Mavlink build option was not working
This commit is contained in:
+1
-1
@@ -1273,7 +1273,7 @@ endif
|
|||||||
|
|
||||||
ifeq ($(EXT), MAVLINK)
|
ifeq ($(EXT), MAVLINK)
|
||||||
CPPDEFS += -DMAVLINK
|
CPPDEFS += -DMAVLINK
|
||||||
INCDIRS += thirdparty
|
INCDIRS += thirdparty targets/common_avr/
|
||||||
CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp targets/common_avr/serial_driver.cpp
|
CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp targets/common_avr/serial_driver.cpp
|
||||||
EEPROM_VARIANT += ${MAVLINK_VARIANT}
|
EEPROM_VARIANT += ${MAVLINK_VARIANT}
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -2074,10 +2074,10 @@ enum FailsafeModes {
|
|||||||
FAILSAFE_LAST = FAILSAFE_RECEIVER
|
FAILSAFE_LAST = FAILSAFE_RECEIVER
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(FRSKY) || !defined(PCBSTD)
|
#if defined(MAVLINK)
|
||||||
#define TELEMETRY_DATA FrSkyData frsky;
|
|
||||||
#elif defined(MAVLINK)
|
|
||||||
#define TELEMETRY_DATA MavlinkData mavlink;
|
#define TELEMETRY_DATA MavlinkData mavlink;
|
||||||
|
#elif defined(FRSKY) || !defined(PCBSTD)
|
||||||
|
#define TELEMETRY_DATA FrSkyData frsky;
|
||||||
#else
|
#else
|
||||||
#define TELEMETRY_DATA
|
#define TELEMETRY_DATA
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ make simu PCB=9X EXT=FRSKY HELI=YES
|
|||||||
make gtests EXT=FRSKY HELI=YES
|
make gtests EXT=FRSKY HELI=YES
|
||||||
./gtests
|
./gtests
|
||||||
|
|
||||||
|
# OpenTX on 9X stock with MAVLINK
|
||||||
|
make clean
|
||||||
|
make PCB=9X EXT=MAVLINK HELI=YES
|
||||||
|
|
||||||
# OpenTX on Taranis X9E
|
# OpenTX on Taranis X9E
|
||||||
make clean
|
make clean
|
||||||
make PCB=TARANIS PCBREV=REV9E HELI=YES GVARS=YES LUA=YES
|
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 clean
|
||||||
make PCB=MEGA2560
|
make PCB=MEGA2560
|
||||||
|
|
||||||
|
# OpenTX on MEGA2560 with MAVLINK
|
||||||
|
make clean
|
||||||
|
make PCB=MEGA2560 EXT=MAVLINK
|
||||||
|
|||||||
Reference in New Issue
Block a user