diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-06 08:08:35 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-06 08:08:35 +0100 |
| commit | 300d891d762acaabee21cbeac9daa25049cae75f (patch) | |
| tree | 5f8047b0fa9f3c27822b5ddc50f29e000a9b310c /makefiles/config_px4fmu-v1_default.mk | |
| parent | dae5c838422a6250e1a7e4920d59cb8976a16a8c (diff) | |
| parent | 40196275d0e899eac49731d0c2b1dda96cafb84f (diff) | |
| download | px4-firmware-300d891d762acaabee21cbeac9daa25049cae75f.tar.gz px4-firmware-300d891d762acaabee21cbeac9daa25049cae75f.tar.bz2 px4-firmware-300d891d762acaabee21cbeac9daa25049cae75f.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 24c08b8bd..cf5119789 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -21,7 +21,7 @@ MODULES += drivers/px4fmu MODULES += drivers/boards/px4fmu-v1 MODULES += drivers/ardrone_interface MODULES += drivers/l3gd20 -MODULES += drivers/bma180 +#MODULES += drivers/bma180 MODULES += drivers/mpu6000 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 @@ -33,7 +33,6 @@ MODULES += drivers/hott/hott_sensors MODULES += drivers/blinkm MODULES += drivers/rgbled MODULES += drivers/mkblctrl -MODULES += drivers/roboclaw MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed @@ -75,18 +74,17 @@ MODULES += modules/attitude_estimator_ekf MODULES += modules/attitude_estimator_so3 MODULES += modules/att_pos_estimator_ekf MODULES += modules/position_estimator_inav -MODULES += examples/flow_position_estimator +#MODULES += examples/flow_position_estimator # # Vehicle Control # -#MODULES += modules/segway # XXX Needs GCC 4.7 fix MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control MODULES += modules/mc_att_control_vector MODULES += modules/mc_pos_control -MODULES += examples/flow_position_control -MODULES += examples/flow_speed_control +#MODULES += examples/flow_position_control +#MODULES += examples/flow_speed_control # # Logging @@ -118,6 +116,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps |