diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-09 08:07:00 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-09 08:07:00 +0100 |
commit | b2366aaa22d8a7f4df1fce43926e42ced84c1853 (patch) | |
tree | 29d8e114fcefaa69613724fc2d8277ca5801d498 /makefiles | |
parent | 12ae4fe86996fb97f021f50efa1089bd485a2eec (diff) | |
parent | ab1d2184542da8f775ac52b44e2103d9cfd1609b (diff) | |
download | px4-firmware-b2366aaa22d8a7f4df1fce43926e42ced84c1853.tar.gz px4-firmware-b2366aaa22d8a7f4df1fce43926e42ced84c1853.tar.bz2 px4-firmware-b2366aaa22d8a7f4df1fce43926e42ced84c1853.zip |
Merge remote-tracking branch 'upstream/master' into ros
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 09106c090..a5f996bb3 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -32,9 +32,9 @@ 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/hott +# MODULES += drivers/hott/hott_telemetry +# MODULES += drivers/hott/hott_sensors # MODULES += drivers/blinkm MODULES += drivers/airspeed MODULES += drivers/ets_airspeed |