diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 13:17:32 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-10-05 13:17:32 +0200 |
| commit | 7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa (patch) | |
| tree | 1fee14fa887b396a76581ed643f16abe4cf0d1aa /src/modules/navigator/module.mk | |
| parent | 9bda573151ae1b5fa87686ee58596ea14e052941 (diff) | |
| parent | 80ed01a5b4324ab13b88dca0b0c8e5ea4f8841ce (diff) | |
| download | px4-firmware-7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa.tar.gz px4-firmware-7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa.tar.bz2 px4-firmware-7f9a231b4014bce4ad44c4eb61bfa0e7efeb73fa.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
src/modules/navigator/navigator.h
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'src/modules/navigator/module.mk')
| -rw-r--r-- | src/modules/navigator/module.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/modules/navigator/module.mk b/src/modules/navigator/module.mk index 5d680948d..f0900da8b 100644 --- a/src/modules/navigator/module.mk +++ b/src/modules/navigator/module.mk @@ -48,7 +48,14 @@ SRCS = navigator_main.cpp \ rtl_params.c \ mission_feasibility_checker.cpp \ geofence.cpp \ - geofence_params.c + geofence_params.c \ + datalinkloss.cpp \ + datalinkloss_params.c \ + rcloss.cpp \ + rcloss_params.c \ + enginefailure.cpp \ + gpsfailure.cpp \ + gpsfailure_params.c INCLUDE_DIRS += $(MAVLINK_SRC)/include/mavlink |