diff options
| author | Andrew Tridgell <tridge@samba.org> | 2013-08-03 12:39:40 +1000 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-04 00:16:01 +0200 |
| commit | 8e599e4a3cf1d89c5ce4d1e8f1020fe047e0a55c (patch) | |
| tree | e2c8a86da59f279a132831170160db096a97cbbe /nuttx-configs/px4fmu-v2 | |
| parent | 4708693f86858772e88d7736a4996023d4f57327 (diff) | |
| download | px4-firmware-8e599e4a3cf1d89c5ce4d1e8f1020fe047e0a55c.tar.gz px4-firmware-8e599e4a3cf1d89c5ce4d1e8f1020fe047e0a55c.tar.bz2 px4-firmware-8e599e4a3cf1d89c5ce4d1e8f1020fe047e0a55c.zip | |
Merged USB ID changes to match bootloader
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 2e73a5a07..fcc7c7df9 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -652,10 +652,12 @@ CONFIG_USBDEV_MAXPOWER=500 CONFIG_CDCACM=y CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_EP0MAXPACKET=64 -CONFIG_CDCACM_EPINTIN=1 +# the endpoint addresses are chosen to match the +# bootloader for the FMUv2 +CONFIG_CDCACM_EPINTIN=3 CONFIG_CDCACM_EPINTIN_FSSIZE=64 CONFIG_CDCACM_EPINTIN_HSSIZE=64 -CONFIG_CDCACM_EPBULKOUT=3 +CONFIG_CDCACM_EPBULKOUT=1 CONFIG_CDCACM_EPBULKOUT_FSSIZE=64 CONFIG_CDCACM_EPBULKOUT_HSSIZE=512 CONFIG_CDCACM_EPBULKIN=2 @@ -664,12 +666,15 @@ CONFIG_CDCACM_EPBULKIN_HSSIZE=512 CONFIG_CDCACM_NWRREQS=4 CONFIG_CDCACM_NRDREQS=4 CONFIG_CDCACM_BULKIN_REQLEN=96 -CONFIG_CDCACM_RXBUFSIZE=256 -CONFIG_CDCACM_TXBUFSIZE=256 +CONFIG_CDCACM_RXBUFSIZE=512 +CONFIG_CDCACM_TXBUFSIZE=512 +# these IDs are chosen to match the bootloader, to prevent +# windows from seeing it as a new device when switching from +# bootloader mode to flight mode CONFIG_CDCACM_VENDORID=0x26ac -CONFIG_CDCACM_PRODUCTID=0x0010 +CONFIG_CDCACM_PRODUCTID=0x0016 CONFIG_CDCACM_VENDORSTR="3D Robotics" -CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v2.x" +CONFIG_CDCACM_PRODUCTSTR="PX4 FMU v2,0" # CONFIG_USBMSC is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set |