diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-14 14:58:02 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-14 14:58:02 +0200 |
| commit | e14d034528088412e6d85f5c0c07917e8076e981 (patch) | |
| tree | 18ceabb25375e8df25a9c72923dcbc167e1dbca4 /nuttx-configs | |
| parent | d0a9d250f74f9f1386760af3d324480d173a1b43 (diff) | |
| parent | 50e3bb28c90bb2cb93f9f0a549cf9c4838973e1c (diff) | |
| download | px4-firmware-e14d034528088412e6d85f5c0c07917e8076e981.tar.gz px4-firmware-e14d034528088412e6d85f5c0c07917e8076e981.tar.bz2 px4-firmware-e14d034528088412e6d85f5c0c07917e8076e981.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index bcf456c56..6a4795c46 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -534,9 +534,10 @@ CONFIG_USBDEV=y # # CONFIG_USBDEV_ISOCHRONOUS is not set # CONFIG_USBDEV_DUALSPEED is not set -CONFIG_USBDEV_SELFPOWERED=y -# CONFIG_USBDEV_BUSPOWERED is not set +# CONFIG_USBDEV_SELFPOWERED is not set +CONFIG_USBDEV_BUSPOWERED=y CONFIG_USBDEV_MAXPOWER=500 +# CONFIG_USBDEV_REMOTEWAKEUP is not set # CONFIG_USBDEV_DMA is not set # CONFIG_USBDEV_TRACE is not set |