aboutsummaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-07-14 13:04:44 -0700
committerpx4dev <px4@purgatory.org>2013-07-14 13:04:44 -0700
commitdca9019f75ddf31a5477db935252eb009a0be655 (patch)
tree6fd0661f9e2c7035097bf2b044b33e95ae352caf /makefiles
parent6cf120831289368015b7b4f51db4f99f418e7129 (diff)
parent60ce9759d9d5a9b5f2e9fd218852fa595cc7bebd (diff)
downloadpx4-firmware-dca9019f75ddf31a5477db935252eb009a0be655.tar.gz
px4-firmware-dca9019f75ddf31a5477db935252eb009a0be655.tar.bz2
px4-firmware-dca9019f75ddf31a5477db935252eb009a0be655.zip
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'makefiles')
-rw-r--r--makefiles/config_px4fmu-v1_default.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk
index 609fd1550..d9a699da7 100644
--- a/makefiles/config_px4fmu-v1_default.mk
+++ b/makefiles/config_px4fmu-v1_default.mk
@@ -28,7 +28,8 @@ MODULES += drivers/ms5611
MODULES += drivers/mb12xx
MODULES += drivers/gps
MODULES += drivers/hil
-MODULES += drivers/hott_telemetry
+MODULES += drivers/hott/hott_telemetry
+MODULES += drivers/hott/hott_sensors
MODULES += drivers/blinkm
MODULES += drivers/mkblctrl
MODULES += drivers/md25