diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-28 10:04:13 +0400 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-28 10:04:13 +0400 |
commit | 7b7539fbbd256165603d545e2c4c99daaf719e3e (patch) | |
tree | 209a98f04a4093ec9d827a5ad61c1d4afc336d07 /makefiles | |
parent | 153114aec8571a9105541b1fef473d36c4099519 (diff) | |
parent | 72d9c80ce954d2289282f5df01aef7e5e8914acc (diff) | |
download | px4-firmware-7b7539fbbd256165603d545e2c4c99daaf719e3e.tar.gz px4-firmware-7b7539fbbd256165603d545e2c4c99daaf719e3e.tar.bz2 px4-firmware-7b7539fbbd256165603d545e2c4c99daaf719e3e.zip |
Merge branch 'navigator_new' into navigator_new_vector, WIP
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 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_logging.mk | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_backside.mk b/makefiles/config_px4fmu-v1_backside.mk index 5ecf93a3a..6da78b287 100644 --- a/makefiles/config_px4fmu-v1_backside.mk +++ b/makefiles/config_px4fmu-v1_backside.mk @@ -107,6 +107,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index eaf8ba5b0..24c08b8bd 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -106,6 +106,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index f9573b605..f63f143c6 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -104,6 +104,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries diff --git a/makefiles/config_px4fmu-v2_logging.mk b/makefiles/config_px4fmu-v2_logging.mk index ed90f6464..4e3cae5ee 100644 --- a/makefiles/config_px4fmu-v2_logging.mk +++ b/makefiles/config_px4fmu-v2_logging.mk @@ -115,6 +115,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += modules/dataman # # Demo apps |