diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-31 21:06:30 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-31 21:06:30 +0200 |
commit | 1cebdf6fb2724b94bce53f37a516dfc913fae994 (patch) | |
tree | 87cc247b0b316776464c6f117d450fc94bfb7735 /nuttx | |
parent | c28c65a81442c02a43cbedd673015c379fbdb490 (diff) | |
parent | 39fd8b9cdaed430ddf45e5a4f052645831e35d25 (diff) | |
download | px4-firmware-1cebdf6fb2724b94bce53f37a516dfc913fae994.tar.gz px4-firmware-1cebdf6fb2724b94bce53f37a516dfc913fae994.tar.bz2 px4-firmware-1cebdf6fb2724b94bce53f37a516dfc913fae994.zip |
Merge branch 'master' of github.com:PX4/Firmware
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/configs/px4fmu/nsh/appconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nuttx/configs/px4fmu/nsh/appconfig b/nuttx/configs/px4fmu/nsh/appconfig index 4f6a0e363..a879eb12f 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -45,6 +45,7 @@ CONFIGURED_APPS += system/readline CONFIGURED_APPS += systemlib CONFIGURED_APPS += systemlib/mixer +# System utility commands CONFIGURED_APPS += systemcmds/reboot CONFIGURED_APPS += systemcmds/perf CONFIGURED_APPS += systemcmds/top @@ -62,6 +63,7 @@ CONFIGURED_APPS += systemcmds/led # https://pixhawk.ethz.ch/px4/dev/deamon # CONFIGURED_APPS += examples/px4_deamon_app +# Shared object broker; required by many parts of the system. CONFIGURED_APPS += uORB CONFIGURED_APPS += mavlink @@ -76,6 +78,7 @@ CONFIGURED_APPS += fixedwing_control CONFIGURED_APPS += position_estimator CONFIGURED_APPS += attitude_estimator_ekf +# Hacking tools #CONFIGURED_APPS += system/i2c #CONFIGURED_APPS += tools/i2c_dev @@ -84,7 +87,7 @@ CONFIGURED_APPS += drivers/device CONFIGURED_APPS += drivers/ms5611 CONFIGURED_APPS += drivers/hmc5883 CONFIGURED_APPS += drivers/mpu6000 -#CONFIGURED_APPS += drivers/bma180 +CONFIGURED_APPS += drivers/bma180 CONFIGURED_APPS += drivers/l3gd20 CONFIGURED_APPS += px4/px4io/driver CONFIGURED_APPS += px4/fmu @@ -102,4 +105,3 @@ endif CONFIGURED_APPS += examples/cdcacm #endif #endif - |