diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-28 16:52:27 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-06-28 16:52:27 +0200 |
| commit | 7b15a424f06074c37ade650c5fd2661495b06e74 (patch) | |
| tree | bff13be26053fa4b9d7ae2afd60cae9d325774e7 /makefiles | |
| parent | 09fd154723c0483a5fa2b39555b6449e0b4f2190 (diff) | |
| parent | cd2867925797b291d6bc1f2a67b53d2e34067bba (diff) | |
| download | px4-firmware-7b15a424f06074c37ade650c5fd2661495b06e74.tar.gz px4-firmware-7b15a424f06074c37ade650c5fd2661495b06e74.tar.bz2 px4-firmware-7b15a424f06074c37ade650c5fd2661495b06e74.zip | |
Merge remote-tracking branch 'upstream/master' into mtecs
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_aerocore_default.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_aerocore_default.mk b/makefiles/config_aerocore_default.mk index fd112b32d..53a2ad1ab 100644 --- a/makefiles/config_aerocore_default.mk +++ b/makefiles/config_aerocore_default.mk @@ -81,6 +81,7 @@ MODULES += lib/mathlib MODULES += lib/mathlib/math/filter MODULES += lib/ecl MODULES += lib/geo +MODULES += lib/geo_lookup MODULES += lib/conversion MODULES += lib/launchdetection diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index f943f62f2..4d727aa4d 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -108,6 +108,7 @@ MODULES += lib/mathlib MODULES += lib/mathlib/math/filter MODULES += lib/ecl MODULES += lib/geo +MODULES += lib/geo_lookup MODULES += lib/conversion MODULES += lib/launchdetection diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 83dd85adb..4b6b0a4d2 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -121,6 +121,7 @@ MODULES += lib/mathlib MODULES += lib/mathlib/math/filter MODULES += lib/ecl MODULES += lib/geo +MODULES += lib/geo_lookup MODULES += lib/conversion MODULES += lib/launchdetection |