diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-01-04 14:28:05 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-01-04 14:28:05 +0100 |
commit | a65de1e0b9412708c862fbe87d459250a7a3d5fd (patch) | |
tree | 0c1ca8efbf81839a6a771150c4ae4c1291d1e397 /makefiles | |
parent | 220011914c01ef4050ca487059b0d317e6b53fb7 (diff) | |
parent | a48264d5d44018412b9443b245e6974d3f54b20d (diff) | |
download | px4-firmware-a65de1e0b9412708c862fbe87d459250a7a3d5fd.tar.gz px4-firmware-a65de1e0b9412708c862fbe87d459250a7a3d5fd.tar.bz2 px4-firmware-a65de1e0b9412708c862fbe87d459250a7a3d5fd.zip |
Merge branch 'navigator_new_fw' into navigator_new
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v1_backside.mk | 1 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_backside.mk b/makefiles/config_px4fmu-v1_backside.mk index 6da78b287..1d32ee7fb 100644 --- a/makefiles/config_px4fmu-v1_backside.mk +++ b/makefiles/config_px4fmu-v1_backside.mk @@ -119,6 +119,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index f724962b2..2f76d81a4 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -118,6 +118,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 3d3dd7203..f0a9c0c06 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -116,6 +116,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps |