diff options
| author | Julian Oes <julian@oes.ch> | 2013-11-18 13:00:09 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-11-18 13:00:09 +0100 |
| commit | 29578a56049cf79b7d983d11ef4b1fa87b00a5d9 (patch) | |
| tree | 5b5577cb2bc9d6f804f2343c2ce46ad0135bce34 /makefiles | |
| parent | 39634d100104b64f205b69017562b3ac549cf264 (diff) | |
| parent | 1cf9f72f628c5dbdf487e464699245cab61c1750 (diff) | |
| download | px4-firmware-29578a56049cf79b7d983d11ef4b1fa87b00a5d9.tar.gz px4-firmware-29578a56049cf79b7d983d11ef4b1fa87b00a5d9.tar.bz2 px4-firmware-29578a56049cf79b7d983d11ef4b1fa87b00a5d9.zip | |
Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 306827086..d116df190 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -105,6 +105,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 761fb8d9d..ec4bb0b0b 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -102,6 +102,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries |