aboutsummaryrefslogtreecommitdiff
path: root/nuttx/configs/px4fmu/nsh/appconfig
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2012-10-26 21:21:07 +0200
committerThomas Gubler <thomasgubler@gmail.com>2012-10-26 21:21:07 +0200
commitf321e7f41936f221a032d62240b9f9d22bc75dc2 (patch)
tree38f579b0aabe507b55b2e87681200f8a83134963 /nuttx/configs/px4fmu/nsh/appconfig
parentb9d03c7c27425dc100dbe3433d9233f98c7fbf30 (diff)
parent241a0d865378d2809de106667cc39b2b9946dfc5 (diff)
downloadpx4-firmware-f321e7f41936f221a032d62240b9f9d22bc75dc2.tar.gz
px4-firmware-f321e7f41936f221a032d62240b9f9d22bc75dc2.tar.bz2
px4-firmware-f321e7f41936f221a032d62240b9f9d22bc75dc2.zip
Merge branch 'master' of https://github.com/PX4/Firmware into fw_control
Diffstat (limited to 'nuttx/configs/px4fmu/nsh/appconfig')
-rw-r--r--nuttx/configs/px4fmu/nsh/appconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig
index 6c9a98ae7..1b5574681 100644
--- a/nuttx/configs/px4fmu/nsh/appconfig
+++ b/nuttx/configs/px4fmu/nsh/appconfig
@@ -76,27 +76,27 @@ CONFIGURED_APPS += sensors
CONFIGURED_APPS += ardrone_interface
CONFIGURED_APPS += multirotor_att_control
CONFIGURED_APPS += multirotor_pos_control
-CONFIGURED_APPS += px4/attitude_estimator_bm
CONFIGURED_APPS += fixedwing_control
CONFIGURED_APPS += fixedwing_att_control
CONFIGURED_APPS += fixedwing_pos_control
CONFIGURED_APPS += position_estimator
CONFIGURED_APPS += attitude_estimator_ekf
-CONFIGURED_APPS += px4/ground_estimator
# Hacking tools
#CONFIGURED_APPS += system/i2c
#CONFIGURED_APPS += tools/i2c_dev
# Communication and Drivers
+CONFIGURED_APPS += drivers/boards/px4fmu
CONFIGURED_APPS += drivers/device
CONFIGURED_APPS += drivers/ms5611
CONFIGURED_APPS += drivers/hmc5883
CONFIGURED_APPS += drivers/mpu6000
CONFIGURED_APPS += drivers/bma180
CONFIGURED_APPS += drivers/l3gd20
+CONFIGURED_APPS += drivers/px4io
+CONFIGURED_APPS += drivers/stm32
CONFIGURED_APPS += drivers/stm32/tone_alarm
-CONFIGURED_APPS += px4/px4io/driver
CONFIGURED_APPS += px4/fmu
# Testing stuff