diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-05 15:19:39 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-01-05 15:19:39 +0100 |
| commit | 018e42733a568f5545864520866c891ed104d783 (patch) | |
| tree | 5780ea6645b3fd6342199ae95c2b1618da874672 /makefiles/config_px4fmu-v1_default.mk | |
| parent | a65de1e0b9412708c862fbe87d459250a7a3d5fd (diff) | |
| parent | ba4f881f807e75edc75d2ad2084dd1ebbbec3802 (diff) | |
| download | px4-firmware-018e42733a568f5545864520866c891ed104d783.tar.gz px4-firmware-018e42733a568f5545864520866c891ed104d783.tar.bz2 px4-firmware-018e42733a568f5545864520866c891ed104d783.zip | |
Merge branch 'master' of github.com:PX4/Firmware into navigator_new
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 2f76d81a4..fba50aaf8 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/multirotor_att_control MODULES += modules/multirotor_pos_control -MODULES += examples/flow_position_control -MODULES += examples/flow_speed_control +#MODULES += examples/flow_position_control +#MODULES += examples/flow_speed_control # # Logging |