diff options
| author | Julian Oes <julian@oes.ch> | 2013-11-29 12:39:29 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-11-29 12:39:29 +0100 |
| commit | 07a3f5694c20ccfae1d949766eca6bd5f60bf0f6 (patch) | |
| tree | 9b690ddb377d3b6c93b87c873733d165c3bffb6e /makefiles | |
| parent | 5c83af3868aaaed20f31f28cbc296fb249dca566 (diff) | |
| parent | 3c2133b9f1af370638cee82d6cda0b31df15dffe (diff) | |
| download | px4-firmware-07a3f5694c20ccfae1d949766eca6bd5f60bf0f6.tar.gz px4-firmware-07a3f5694c20ccfae1d949766eca6bd5f60bf0f6.tar.bz2 px4-firmware-07a3f5694c20ccfae1d949766eca6bd5f60bf0f6.zip | |
Merge remote-tracking branch 'juchlid/bottledrop' into bottle_drop_navigator
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index b9aec79fe..826b5131a 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -116,6 +116,11 @@ MODULES += lib/geo MODULES += lib/conversion # +# OBC challenge +# +MODULES += modules/bottle_drop + +# # Demo apps # #MODULES += examples/math_demo |