aboutsummaryrefslogtreecommitdiff
path: root/makefiles/config_px4fmu-v2_default.mk
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-08-26 09:37:56 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-08-26 09:37:56 +0200
commit47e39841df7f4dce7ea05644d3d069bb3e4c4a4c (patch)
tree853fb1e43c3aa141cf69b09f96167bdbc53acccf /makefiles/config_px4fmu-v2_default.mk
parent943463391241cdad88cc169d9cedbb5cb4cddf47 (diff)
parent65af8ec55e45261a73e247f3fd28c7abf4fc22bd (diff)
downloadpx4-firmware-47e39841df7f4dce7ea05644d3d069bb3e4c4a4c.tar.gz
px4-firmware-47e39841df7f4dce7ea05644d3d069bb3e4c4a4c.tar.bz2
px4-firmware-47e39841df7f4dce7ea05644d3d069bb3e4c4a4c.zip
Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r--makefiles/config_px4fmu-v2_default.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index 5f146686c..d17dff5bb 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -129,6 +129,11 @@ MODULES += lib/conversion
MODULES += lib/launchdetection
#
+# OBC challenge
+#
+MODULES += modules/bottle_drop
+
+#
# Demo apps
#
#MODULES += examples/math_demo