diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-16 16:46:57 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-02-16 16:46:57 +0100 |
| commit | 400b073aa321d78958978db21c3a810e58876b59 (patch) | |
| tree | 02b6faf93aa7e7358ed52a99bc437b999d17062f /nuttx | |
| parent | 6eb69b07a8fd44fff1bfcf77bf4622f4dd044eef (diff) | |
| parent | 781845587cf98e5aafbccdb4ace45e014cc2d043 (diff) | |
| download | px4-firmware-400b073aa321d78958978db21c3a810e58876b59.tar.gz px4-firmware-400b073aa321d78958978db21c3a810e58876b59.tar.bz2 px4-firmware-400b073aa321d78958978db21c3a810e58876b59.zip | |
Merge branch 'master' of github.com:PX4/Firmware into px4io-i2c
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 a03d1d3dc..a904d90ac 100644 --- a/nuttx/configs/px4fmu/nsh/appconfig +++ b/nuttx/configs/px4fmu/nsh/appconfig @@ -80,7 +80,6 @@ CONFIGURED_APPS += uORB CONFIGURED_APPS += mavlink CONFIGURED_APPS += mavlink_onboard -CONFIGURED_APPS += gps CONFIGURED_APPS += commander CONFIGURED_APPS += sdlog CONFIGURED_APPS += sensors @@ -114,6 +113,7 @@ CONFIGURED_APPS += drivers/stm32/tone_alarm CONFIGURED_APPS += drivers/stm32/adc CONFIGURED_APPS += drivers/px4fmu CONFIGURED_APPS += drivers/hil +CONFIGURED_APPS += drivers/gps # Testing stuff CONFIGURED_APPS += px4/sensors_bringup |