diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-21 15:50:54 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-21 15:50:54 +0100 |
commit | 52a2a23cc77cff300d0c73f66a450fc1a8fccd5a (patch) | |
tree | 8daca15ab02311e4432c0d236656766f17b6157d | |
parent | 779400aad3f3a97057e4377d51ff362756938241 (diff) | |
parent | 1628999361f5bd939ffd6312cae1d9e67698f3d4 (diff) | |
download | px4-firmware-52a2a23cc77cff300d0c73f66a450fc1a8fccd5a.tar.gz px4-firmware-52a2a23cc77cff300d0c73f66a450fc1a8fccd5a.tar.bz2 px4-firmware-52a2a23cc77cff300d0c73f66a450fc1a8fccd5a.zip |
Merge remote-tracking branch 'upstream/ros' into ros_messagelayer_merge
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index aa2e01229..2ce738844 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -31,7 +31,7 @@ MODULES += drivers/mb12xx MODULES += drivers/ll40ls # MODULES += drivers/trone MODULES += drivers/gps -MODULES += drivers/hil +# MODULES += drivers/hil # MODULES += drivers/hott # MODULES += drivers/hott/hott_telemetry # MODULES += drivers/hott/hott_sensors @@ -77,7 +77,7 @@ MODULES += modules/land_detector # Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/ekf_att_pos_estimator +# MODULES += modules/ekf_att_pos_estimator MODULES += modules/position_estimator_inav # |