diff options
| author | px4dev <px4@purgatory.org> | 2013-04-26 11:27:26 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-04-26 11:27:26 -0700 |
| commit | 3acdc9d4ce3d83af6bb7f953e466620be690658e (patch) | |
| tree | c1c792b44f7454ce36a288034179764ebc355daa /nuttx | |
| parent | 8224adf52a126105c72e41db2ba35b1aaed3e301 (diff) | |
| parent | 556a017444b809c18e2ce495a2fd00380960e0f4 (diff) | |
| download | px4-firmware-3acdc9d4ce3d83af6bb7f953e466620be690658e.tar.gz px4-firmware-3acdc9d4ce3d83af6bb7f953e466620be690658e.tar.bz2 px4-firmware-3acdc9d4ce3d83af6bb7f953e466620be690658e.zip | |
Merge branch 'master' into export-build
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/px4fmu/nsh/appconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 80cf6f312..9e28ff485 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -97,7 +97,7 @@ ifneq ($(CONFIG_APM),y) CONFIGURED_APPS += ardrone_interface CONFIGURED_APPS += multirotor_att_control CONFIGURED_APPS += multirotor_pos_control -#CONFIGURED_APPS += fixedwing_control +CONFIGURED_APPS += position_estimator_mc CONFIGURED_APPS += fixedwing_att_control CONFIGURED_APPS += fixedwing_pos_control CONFIGURED_APPS += position_estimator |