Merged USB ID changes to match bootloader

This commit is contained in:
Andrew Tridgell
2013-08-04 00:16:01 +02:00
committed by Lorenz Meier
parent 4708693f86
commit 8e599e4a3c
+11 -6
View File
@@ -652,10 +652,12 @@ CONFIG_USBDEV_MAXPOWER=500
CONFIG_CDCACM=y CONFIG_CDCACM=y
CONFIG_CDCACM_CONSOLE=y CONFIG_CDCACM_CONSOLE=y
CONFIG_CDCACM_EP0MAXPACKET=64 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_FSSIZE=64
CONFIG_CDCACM_EPINTIN_HSSIZE=64 CONFIG_CDCACM_EPINTIN_HSSIZE=64
CONFIG_CDCACM_EPBULKOUT=3 CONFIG_CDCACM_EPBULKOUT=1
CONFIG_CDCACM_EPBULKOUT_FSSIZE=64 CONFIG_CDCACM_EPBULKOUT_FSSIZE=64
CONFIG_CDCACM_EPBULKOUT_HSSIZE=512 CONFIG_CDCACM_EPBULKOUT_HSSIZE=512
CONFIG_CDCACM_EPBULKIN=2 CONFIG_CDCACM_EPBULKIN=2
@@ -664,12 +666,15 @@ CONFIG_CDCACM_EPBULKIN_HSSIZE=512
CONFIG_CDCACM_NWRREQS=4 CONFIG_CDCACM_NWRREQS=4
CONFIG_CDCACM_NRDREQS=4 CONFIG_CDCACM_NRDREQS=4
CONFIG_CDCACM_BULKIN_REQLEN=96 CONFIG_CDCACM_BULKIN_REQLEN=96
CONFIG_CDCACM_RXBUFSIZE=256 CONFIG_CDCACM_RXBUFSIZE=512
CONFIG_CDCACM_TXBUFSIZE=256 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_VENDORID=0x26ac
CONFIG_CDCACM_PRODUCTID=0x0010 CONFIG_CDCACM_PRODUCTID=0x0016
CONFIG_CDCACM_VENDORSTR="3D Robotics" 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_USBMSC is not set
# CONFIG_USBHOST is not set # CONFIG_USBHOST is not set
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set