diff options
| author | px4dev <px4@purgatory.org> | 2013-04-26 12:35:45 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-04-26 12:35:45 -0700 |
| commit | 187f7603b9e3ccbf5ac858d250931d583b52d9eb (patch) | |
| tree | 059af67adc5fc7edbcf2b15cdd28cf07e7cf3eb6 /nuttx | |
| parent | 9169ceb3f4884a863d527c6b8e7ea237b41a48ce (diff) | |
| parent | 3acdc9d4ce3d83af6bb7f953e466620be690658e (diff) | |
| download | px4-firmware-187f7603b9e3ccbf5ac858d250931d583b52d9eb.tar.gz px4-firmware-187f7603b9e3ccbf5ac858d250931d583b52d9eb.tar.bz2 px4-firmware-187f7603b9e3ccbf5ac858d250931d583b52d9eb.zip | |
Merge branch 'export-build' into fmuv2_bringup
Sync with master via 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 efa89a173..1e5d7d4e1 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -96,7 +96,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 |