diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-29 08:00:12 +0100 |
commit | f4e0dc2857da7a8b42b7439ae57310b23c902cd9 (patch) | |
tree | d31b6697458c5f54672ea6b5bbc3a267e6fa1be5 /makefiles/config_px4fmu-v2_default.mk | |
parent | acb4844939f971a1a33515316f5e6c7c8f668f12 (diff) | |
parent | 22f744f0e17f83a706998381d1977c9cb24d457a (diff) | |
download | px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.gz px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.tar.bz2 px4-firmware-f4e0dc2857da7a8b42b7439ae57310b23c902cd9.zip |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
.gitmodules
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index ce12a2157..86b2f7cf2 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -32,6 +32,7 @@ MODULES += drivers/ll40ls # MODULES += drivers/trone MODULES += drivers/gps MODULES += drivers/hil +MODULES += drivers/hott MODULES += drivers/hott/hott_telemetry MODULES += drivers/hott/hott_sensors # MODULES += drivers/blinkm |