diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 13:26:25 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 13:26:25 +0200 |
commit | 852e6e2f499499502e023c240d2d948500235296 (patch) | |
tree | dc17c8b36fa6718ed063b994ea87d27d87a3b769 /makefiles | |
parent | 3d6aff38da00ed71d30aeea4f9d3ae50b4606b98 (diff) | |
parent | c89f46f59055f4cc0d7ada4a26e48f021278538e (diff) | |
download | px4-firmware-852e6e2f499499502e023c240d2d948500235296.tar.gz px4-firmware-852e6e2f499499502e023c240d2d948500235296.tar.bz2 px4-firmware-852e6e2f499499502e023c240d2d948500235296.zip |
Merged with upstream export-build branch
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu_default.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index c5ee9e642..0e03641db 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -15,6 +15,8 @@ MODULES += drivers/boards/px4fmu MODULES += drivers/lsm303d MODULES += drivers/l3gd20 MODULES += drivers/ardrone_interface +MODULES += drivers/px4io +MODULES += modules/sensors # # System commands @@ -43,6 +45,12 @@ MODULES += modules/mavlink_onboard # Estimation modules (EKF / other filters) # MODULES += modules/attitude_estimator_ekf +MODULES += modules/position_estimator_mc + +# +# Logging +# +MODULES += modules/sdlog # # Transitional support - add commands from the NuttX export archive. @@ -74,10 +82,6 @@ BUILTIN_COMMANDS := \ $(call _B, ms5611, , 2048, ms5611_main ) \ $(call _B, multirotor_att_control, SCHED_PRIORITY_MAX-15, 2048, multirotor_att_control_main) \ $(call _B, multirotor_pos_control, SCHED_PRIORITY_MAX-25, 2048, multirotor_pos_control_main) \ - $(call _B, position_estimator, , 4096, position_estimator_main ) \ - $(call _B, px4io, , 2048, px4io_main ) \ - $(call _B, sdlog, SCHED_PRIORITY_MAX-30, 2048, sdlog_main ) \ - $(call _B, sensors, SCHED_PRIORITY_MAX-5, 4096, sensors_main ) \ $(call _B, sercon, , 2048, sercon_main ) \ $(call _B, serdis, , 2048, serdis_main ) \ $(call _B, tone_alarm, , 2048, tone_alarm_main ) \ |